diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index b68bd770bb..0c1e28b3fc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -3091,13 +3091,13 @@ public class AssignmentManager extends ZooKeeperListener { continue; } TableName tableName = regionInfo.getTable(); - if (!onlineServers.contains(regionLocation)) { + if (regionLocation != null && !onlineServers.contains(regionLocation)) { // Region is located on a server that isn't online offlineServers.add(regionLocation); if (useZKForAssignment) { regionStates.regionOffline(regionInfo); } - } else if (!disabledOrEnablingTables.contains(tableName)) { + } else if (regionLocation != null && !disabledOrEnablingTables.contains(tableName)) { // Region is being served and on an active server // add only if region not in disabled or enabling table regionStates.regionOnline(regionInfo, regionLocation);