Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java (revision 1564110) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java (working copy) @@ -172,8 +172,13 @@ HTable table = new HTable(masterServices.getConfiguration(), tableName); TreeMap> serverToRegions = Maps .newTreeMap(); - NavigableMap hriHserverMapping = table.getRegionLocations(); - table.close(); + NavigableMap hriHserverMapping; + try { + hriHserverMapping = table.getRegionLocations(); + } finally { + table.close(); + } + List reRegions = new ArrayList(); for (HRegionInfo hri : regions) { ServerName rsLocation = hriHserverMapping.get(hri);