svn commit: r1245767 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase: catalog/MetaReader.java master/AssignmentManager.java regionserver/HRegion.java

[stack]

Author: stack
Date: Fri Feb 17 21:24:21 2012
New Revision: 1245767

URL: http://svn.apache.org/viewvc?rev=1245767&view=rev
Log:
HBASE-5279 NPE in Master after upgrading to 0.92.0

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1245767&r1=1245766&r2=1245767&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java 
Fri Feb 17 21:24:21 2012
@@ -118,6 +118,8 @@ public class MetaReader {
         Pair<HRegionInfo, ServerName> region = parseCatalogResult(r);
         if (region == null) return true;
         HRegionInfo hri = region.getFirst();
+        if (hri  == null) return true;
+        if (hri.getTableNameAsString() == null) return true;
         if (disabledTables.contains(
             hri.getTableNameAsString())) return true;
         // Are we to include split parents in the list?

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1245767&r1=1245766&r2=1245767&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java 
Fri Feb 17 21:24:21 2012
@@ -2254,6 +2254,7 @@ public class AssignmentManager extends Z
       if (region == null) continue;
       HRegionInfo regionInfo = region.getFirst();
       ServerName regionLocation = region.getSecond();
+      if (regionInfo == null) continue;
       String tableName = regionInfo.getTableNameAsString();
       if (regionLocation == null) {
         // regionLocation could be null if createTable didn't finish properly.

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1245767&r1=1245766&r2=1245767&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
Fri Feb 17 21:24:21 2012
@@ -4123,6 +4123,8 @@ public class HRegion implements HeapSize
        }
     }
 
+    Scan scan = new Scan(get);
+
     RegionScanner scanner = null;
     try {
       scanner = getScanner(scan);