You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2017/03/20 22:49:46 UTC
[13/54] [abbrv] hbase git commit: HBASE-17803 Addendum fix NPE
HBASE-17803 Addendum fix NPE
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/261aa944
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/261aa944
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/261aa944
Branch: refs/heads/HBASE-16961
Commit: 261aa9445c3c52e09c10d06168a77d11d0c9b4b4
Parents: 23abc90
Author: Chia-Ping Tsai <ch...@gmail.com>
Authored: Sun Mar 19 19:05:25 2017 +0800
Committer: Chia-Ping Tsai <ch...@gmail.com>
Committed: Sun Mar 19 19:05:25 2017 +0800
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/261aa944/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 3addb1a..40e50cf 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
@@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -325,7 +326,8 @@ public class PerformanceEvaluation extends Configured implements Tool {
// recreate the table when user has requested presplit or when existing
// {RegionSplitPolicy,replica count} does not match requested.
if ((exists && opts.presplitRegions != DEFAULT_OPTS.presplitRegions)
- || (!isReadCmd && desc != null && !desc.getRegionSplitPolicyClassName().equals(opts.splitPolicy))
+ || (!isReadCmd && desc != null &&
+ !StringUtils.equals(desc.getRegionSplitPolicyClassName(), opts.splitPolicy))
|| (!isReadCmd && desc != null && desc.getRegionReplication() != opts.replicas)) {
needsDelete = true;
// wait, why did it delete my table?!?