HBASE-5279 NPE in Master after upgrading to 0.92.0

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1245767 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java

@@ -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?

src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

@@ -2254,6 +2254,7 @@ public class AssignmentManager extends ZooKeeperListener {
       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.

src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -4123,6 +4123,8 @@ public class HRegion implements HeapSize { // , Writable{
        }
     }
 
+    Scan scan = new Scan(get);
+
     RegionScanner scanner = null;
     try {
       scanner = getScanner(scan);