From cf34adaf5ef3ad6b89d57e1a6adb874fbe1cfc68 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 29 Nov 2017 19:11:05 -0800 Subject: [PATCH] HBASE-19379 TestEndToEndSplitTransaction fails with NPE --- .../main/java/org/apache/hadoop/hbase/HRegionLocation.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java index 373e76b57c..2b354f89ee 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionLocation.java @@ -83,6 +83,9 @@ public class HRegionLocation implements Comparable { */ @Override public int hashCode() { + if (serverName == null) { + return System.identityHashCode(this); + } return this.serverName.hashCode(); } @@ -116,6 +119,13 @@ public class HRegionLocation implements Comparable { @Override public int compareTo(HRegionLocation o) { - return serverName.compareTo(o.getServerName()); + if (serverName == null) { + if (o.serverName != null) { + return 1; + } + return 0; + } else { + return serverName.compareTo(o.getServerName()); + } } } -- 2.13.4