diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java index 5a05660..248dd8f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java @@ -275,13 +275,11 @@ public class ReplicationSink { // Build hfile relative path from its namespace String pathToHfileFromNS = getHFilePath(table, bld, storeFileList.get(k), family); - String tableName = table.getNameWithNamespaceInclAsString(); - if (bulkLoadHFileMap.containsKey(tableName)) { - List>> familyHFilePathsList = bulkLoadHFileMap.get(tableName); + List>> familyHFilePathsList = bulkLoadHFileMap.get(tableName); + if (familyHFilePathsList != null) { boolean foundFamily = false; - for (int i = 0; i < familyHFilePathsList.size(); i++) { - Pair> familyHFilePathsPair = familyHFilePathsList.get(i); + for (Pair> familyHFilePathsPair : familyHFilePathsList) { if (Bytes.equals(familyHFilePathsPair.getFirst(), family)) { // Found family already present, just add the path to the existing list familyHFilePathsPair.getSecond().add(pathToHfileFromNS);