Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (revision 1507799) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (working copy) @@ -366,7 +366,16 @@ assertTrue(exceptionThrown); } } - /** + + @Test + public void testIsEnabledOnNonexistentTable() throws IOException { + try { + assertFalse(admin.isTableEnabled(Bytes.toBytes("non-existing"))); + } catch (IOException e) { + } + } + + /** * Verify schema modification takes. * @throws IOException * @throws InterruptedException Index: hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableReadOnly.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableReadOnly.java (revision 1507799) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableReadOnly.java (working copy) @@ -141,7 +141,7 @@ throws KeeperException { String znode = ZKUtil.joinZNode(zkw.tableZNode, child); byte [] data = ZKUtil.getData(zkw, znode); - if (data == null || data.length <= 0) return ZooKeeperProtos.Table.State.ENABLED; + if (data == null || data.length <= 0) return null; try { ProtobufUtil.expectPBMagicPrefix(data); ZooKeeperProtos.Table.Builder builder = ZooKeeperProtos.Table.newBuilder();