From 39fdafd9ae9ca153d2cd442554ac2469c3f16fb8 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 22 Oct 2015 11:22:53 -0700 Subject: [PATCH] HBASE-14658 ADDENDUM --- .../org/apache/hadoop/hbase/chaos/factories/MonkeyFactory.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/MonkeyFactory.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/MonkeyFactory.java index e479975..2a69c8c 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/MonkeyFactory.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/factories/MonkeyFactory.java @@ -93,13 +93,16 @@ public abstract class MonkeyFactory { public static MonkeyFactory getFactory(String factoryName) { MonkeyFactory fact = FACTORIES.get(factoryName); - if (fact == null) { + if (fact == null && factoryName != null && !factoryName.isEmpty()) { Class klass = null; try { klass = Class.forName(factoryName); - fact = (MonkeyFactory) ReflectionUtils.newInstance(klass); - } catch (ClassNotFoundException e) { + if (klass != null) { + fact = (MonkeyFactory) ReflectionUtils.newInstance(klass); + } + } catch (Exception e) { LOG.error("Error trying to create " + factoryName + " could not load it by class name"); + return null; } } return fact; -- 2.6.1