diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java index 3f2dab3debe..23e5a666b2b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java @@ -83,8 +83,12 @@ public class ReplicationMetaCleaner extends ScheduledChore { List peers = admin.listReplicationPeers(); for (ReplicationPeerDescription peerDesc : peers) { - for (Map.Entry> map : peerDesc.getPeerConfig().getTableCFsMap() - .entrySet()) { + Map> tableCFsMap = peerDesc.getPeerConfig().getTableCFsMap(); + if (tableCFsMap ==null) { + continue; + } + + for (Map.Entry> map : tableCFsMap.entrySet()) { if (serialTables.containsKey(map.getKey().getNameAsString())) { serialTables.get(map.getKey().getNameAsString()).add(peerDesc.getPeerId()); break;