Index: hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1378760) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -904,7 +904,9 @@ * @throws IOException if a remote or network exception occurs */ public boolean isTableEnabled(byte[] tableName) throws IOException { - HTableDescriptor.isLegalTableName(tableName); + if (!HTableDescriptor.isMetaTable(tableName)) { + HTableDescriptor.isLegalTableName(tableName); + } return connection.isTableEnabled(tableName); } @@ -923,7 +925,9 @@ * @throws IOException if a remote or network exception occurs */ public boolean isTableDisabled(byte[] tableName) throws IOException { - HTableDescriptor.isLegalTableName(tableName); + if (!HTableDescriptor.isMetaTable(tableName)) { + HTableDescriptor.isLegalTableName(tableName); + } return connection.isTableDisabled(tableName); }