diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java index c0940edb356..6082c52a78e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java @@ -69,7 +69,7 @@ public class DelimitedKeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundR @Override protected byte[] getSplitPoint() { byte[] splitPoint = super.getSplitPoint(); - if (delimiter != null) { + if (splitPoint != null && delimiter != null) { //find the first occurrence of delimiter in split point int index = com.google.common.primitives.Bytes.indexOf(splitPoint, delimiter);