[hbase] branch master updated: HBASE-24635 Addendum make test more robust

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new af49b87  HBASE-24635 Addendum make test more robust
af49b87 is described below

commit af49b8736753da8dbc543419828b58397e3862fb
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Jun 27 11:29:43 2020 +0800

    HBASE-24635 Addendum make test more robust
---
 .../org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java
index f03ac2f..11e5404 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestShutdownOfMetaReplicaHolder.java
@@ -57,7 +57,7 @@ public class TestShutdownOfMetaReplicaHolder extends MetaWithReplicasTestBase {
       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(),