svn commit: r1551772 - /hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[jx...@apache.org]

Author: jxiang
Date: Wed Dec 18 00:02:02 2013
New Revision: 1551772

URL: http://svn.apache.org/r1551772
Log:
HBASE-10182 Potential null object deference in AssignmentManager#handleRegion()

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1551772&r1=1551771&r2=1551772&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Wed Dec 18 00:02:02 2013
@@ -924,10 +924,12 @@ public class AssignmentManager extends Z
               + " from " + sn + " but the region isn't PENDING_OPEN/OPENING here: "
               + regionStates.getRegionState(encodedName));
 
-            // Close it without updating the internal region states,
-            // so as not to create double assignments in unlucky scenarios
-            // mentioned in OpenRegionHandler#process
-            unassign(regionState.getRegion(), null, -1, null, false, sn);
+            if (regionState != null) {
+              // Close it without updating the internal region states,
+              // so as not to create double assignments in unlucky scenarios
+              // mentioned in OpenRegionHandler#process
+              unassign(regionState.getRegion(), null, -1, null, false, sn);
+            }
             return;
           }
           // Handle OPENED by removing from transition and deleted zk node