svn commit: r1045401 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

[stack]

Author: stack
Date: Mon Dec 13 22:38:10 2010
New Revision: 1045401

URL: http://svn.apache.org/viewvc?rev=1045401&view=rev
Log:
HBASE-3347 Can't truncate/disable table that has rows in .META. that have empty 
info:regioninfo column

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1045401&r1=1045400&r2=1045401&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Mon Dec 13 22:38:10 2010
@@ -734,6 +734,8 @@ Release 0.90.0 - Unreleased
                via shell
    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
 
 
   IMPROVEMENTS

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1045401&r1=1045400&r2=1045401&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Mon Dec 13 22:38:10 2010
@@ -502,9 +502,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;