### Eclipse Workspace Patch 1.0 #P apache-hbase-trunk Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (revision 1372726) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (working copy) @@ -125,6 +125,11 @@ // tables are onlined. List regionsInMeta; regionsInMeta = MetaReader.getTableRegions(this.ct, tableName, true); + if (regionsInMeta == null || regionsInMeta.size() == 0) { + LOG.warn("Table is deleted already, clean table state in zk. see HBASE-6588."); + this.assignmentManager.getZKTable().setDeletedTable(tableNameStr); + return; + } int countOfRegionsInTable = regionsInMeta.size(); List regions = regionsToAssign(regionsInMeta); int regionsCount = regions.size();