diff --git src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index 349698d..11d8bf9 100644 --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -2152,7 +2152,7 @@ public class HConnectionManager { @Override public HTableDescriptor[] getHTableDescriptors(List tableNames) throws IOException { - if (tableNames == null || tableNames.isEmpty()) return null; + if (tableNames == null || tableNames.isEmpty()) return new HTableDescriptor[0]; MasterKeepAliveConnection master = getKeepAliveMaster(); try { return master.getHTableDescriptors(tableNames); diff --git src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java index aa1f4b0..7b4f4a2 100644 --- src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java +++ src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java @@ -2095,7 +2095,7 @@ public class HBaseFsck { } HTableDescriptor[] getHTableDescriptors(List tableNames) { - HTableDescriptor[] htd = null; + HTableDescriptor[] htd = new HTableDescriptor[0]; try { LOG.info("getHTableDescriptors == tableNames => " + tableNames); htd = new HBaseAdmin(conf).getTableDescriptors(tableNames);