svn commit: r1124477 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[jdcryans]

Author: jdcryans
Date: Thu May 19 00:24:18 2011
New Revision: 1124477

URL: http://svn.apache.org/viewvc?rev=1124477&view=rev
Log:
   HBASE-3874  ServerShutdownHandler fails on NPE if a plan has a random
               region assignment

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1124477&r1=1124476&r2=1124477&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu May 19 00:24:18 2011
@@ -256,14 +256,15 @@ Release 0.91.0 - Unreleased
 Release 0.90.4 - Unreleased
 
   BUG FIXES
-   HBASE-3878 Hbase client throws NoSuchElementException (Ted Yu)
-   HBASE-3878 Hbase client throws NoSuchElementException (Ted Yu)
-   HBASE-3881 Add disable balancer in graceful_stop.sh script
-   HBASE-3895 Fix order of parameters after HBASE-1511
+   HBASE-3878  Hbase client throws NoSuchElementException (Ted Yu)
+   HBASE-3881  Add disable balancer in graceful_stop.sh script
+   HBASE-3895  Fix order of parameters after HBASE-1511
+   HBASE-3874  ServerShutdownHandler fails on NPE if a plan has a random
+               region assignment
 
   IMPROVEMENT
-   HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the
-              sun jre provided by RHEL6 (Roman Shaposhnik)
+   HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the
+               sun jre provided by RHEL6 (Roman Shaposhnik)
 
 Release 0.90.3 - Unreleased
 

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=1124477&r1=1124476&r2=1124477&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 
Thu May 19 00:24:18 2011
@@ -1995,7 +1995,9 @@ public class AssignmentManager extends Z
       for (Iterator <Map.Entry<String, RegionPlan>> i =
           this.regionPlans.entrySet().iterator(); i.hasNext();) {
         Map.Entry<String, RegionPlan> e = i.next();
-        if (e.getValue().getDestination().equals(sn)) {
+        ServerName otherSn = e.getValue().getDestination();
+        // The name will be null if the region is planned for a random assign.
+        if (otherSn != null && otherSn.equals(sn)) {
           // Use iterator's remove else we'll get CME
           i.remove();
         }