HBASE-24635 Addendum make test more robust

apache · Jun 27, 2020 · af49b87 · af49b87
1 parent 16a25b7
commit af49b87
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java b/...-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java
@@ -57,7 +57,7 @@ public void testShutdownOfReplicaHolder() throws Exception {
       LOG.debug("Waiting for the replica {} to come up", hrl.getRegion());
       TEST_UTIL.waitFor(30000, () -> {
         HRegionLocation loc = locator.getRegionLocations(HConstants.EMPTY_START_ROW, true).get(1);
-        return !loc.getServerName().equals(oldServer);
+        return loc != null && !loc.getServerName().equals(oldServer);
       });
       LOG.debug("Replica {} is online on {}, old server is {}", hrl.getRegion(),
         locator.getRegionLocations(HConstants.EMPTY_START_ROW, true).get(1).getServerName(),