svn commit: r1124468 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[jdcryans]

Author: jdcryans
Date: Wed May 18 23:50:37 2011
New Revision: 1124468

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

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1124468&r1=1124467&r2=1124468&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed May 18 23:50:37 2011
@@ -1,14 +1,16 @@
 HBase Change Log
 Release 0.90.4 - Unreleased
   BUG FIXES
-    HBASE-3617 NoRouteToHostException during balancing will cause Master abort
+   HBASE-3617  NoRouteToHostException during balancing will cause Master abort
                (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
+   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/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1124468&r1=1124467&r2=1124468&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 Wed May 18 23:50:37 2011
@@ -1776,7 +1776,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(hsi)) {
+        HServerInfo otherHsi = e.getValue().getDestination();
+        // The HSI will be null if the region is planned for a random assign.
+        if (otherHsi != null && otherHsi.equals(hsi)) {
           // Use iterator's remove else we'll get CME
           i.remove();
         }