diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java index b8cd4297ec5..10a48ae28ac 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java @@ -329,6 +329,9 @@ public class MetaCache { TableName tableName = location.getRegionInfo().getTable(); ConcurrentMap tableLocations = getTableLocations(tableName); RegionLocations rll = tableLocations.get(location.getRegionInfo().getStartKey()); + if (rll == null) { + return; + } RegionLocations updatedLocations = rll.remove(location); if (updatedLocations.isEmpty()) { tableLocations.remove(location.getRegionInfo().getStartKey(), rll);