diff --git a/CHANGES.txt b/CHANGES.txt index 37c67844397..7559c30fcca 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -763,6 +763,8 @@ Release 0.90.0 - Unreleased HBASE-3278 AssertionError in LoadBalancer HBASE-3318 Split rollback leaves parent with writesEnabled=false HBASE-3334 Refresh our hadoop jar because of HDFS-1520 + HBASE-3347 Can't truncate/disable table that has rows in .META. that have empty + info:regioninfo column diff --git a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java index 2c139bd0458..80b00a73803 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ b/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -495,9 +495,10 @@ public class HConnectionManager { this.tableName = tableName; } public boolean processRow(Result rowResult) throws IOException { - HRegionInfo info = Writables.getHRegionInfo( + HRegionInfo info = Writables.getHRegionInfoOrNull( rowResult.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER)); + if (info == null) return true; HTableDescriptor desc = info.getTableDesc(); if (Bytes.compareTo(desc.getName(), tableName) == 0) { result = desc;