Index: src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1510832) +++ src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -78,8 +78,6 @@ import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.util.StringUtils; -import com.google.protobuf.ServiceException; - /** * Provides an interface to manage HBase database table metadata + general * administrative functions. Use HBaseAdmin to create, drop, list, enable and @@ -957,6 +955,10 @@ if (!HTableDescriptor.isMetaTable(tableName)) { HTableDescriptor.isLegalTableName(tableName); } + + if (!tableExists(tableName)) { + throw new TableNotFoundException(Bytes.toString(tableName)); + } return connection.isTableDisabled(tableName); } Index: src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1510832) +++ src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy) @@ -274,12 +274,18 @@ } @Test - public void testIsEnabledOnUnknownTable() throws Exception { + public void testIsEnabledOrDisabledOnUnknownTable() throws Exception { try { admin.isTableEnabled(Bytes.toBytes("unkownTable")); fail("Test should fail if isTableEnabled called on unknown table."); } catch (IOException e) { } + + try { + admin.isTableDisabled(Bytes.toBytes("unkownTable")); + fail("Test should fail if isTableDisabled called on unknown table."); + } catch (IOException e) { + } } @Test