Repository: hbase
Updated Branches:
  refs/heads/branch-1 cf73199d0 -> 6c2d51132
  refs/heads/branch-1.4 319088340 -> 6fcbdc0cc


HBASE-19445 PerformanceEvaluation NPE processing split policy option


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6fcbdc0c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6fcbdc0c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6fcbdc0c

Branch: refs/heads/branch-1.4
Commit: 6fcbdc0cc799ae8df965b4a0677e6fe2f1f7a54c
Parents: 3190883
Author: Andrew Purtell <[email protected]>
Authored: Wed Dec 6 14:08:55 2017 -0800
Committer: Andrew Purtell <[email protected]>
Committed: Wed Dec 6 14:09:26 2017 -0800

----------------------------------------------------------------------
 .../test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/6fcbdc0c/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
index 7230b41..85d3613 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -384,7 +384,7 @@ public class PerformanceEvaluation extends Configured 
implements Tool {
     if (opts.replicas != DEFAULT_OPTS.replicas) {
       desc.setRegionReplication(opts.replicas);
     }
-    if (!opts.splitPolicy.equals(DEFAULT_OPTS.splitPolicy)) {
+    if (opts.splitPolicy != null && 
!opts.splitPolicy.equals(DEFAULT_OPTS.splitPolicy)) {
       desc.setRegionSplitPolicyClassName(opts.splitPolicy);
     }
     return desc;

Reply via email to