svn commit: r1145856 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

[st...@apache.org]

Author: stack
Date: Wed Jul 13 04:19:39 2011
New Revision: 1145856

URL: http://svn.apache.org/viewvc?rev=1145856&view=rev
Log:
HBASE-4088 npes in server shutdown

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1145856&r1=1145855&r2=1145856&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Jul 13 04:19:39 2011
@@ -66,6 +66,7 @@ Release 0.90.4 - Unreleased
    HBASE-4077  Deadlock if WrongRegionException is thrown from getLock in HRegion.delete
                (Adam Warrington via Ted Yu)
    HBASE-3893  HRegion.internalObtainRowLock shouldn't wait forever
+   HBASE-4088  npes in server shutdown
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1145856&r1=1145855&r2=1145856&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Wed Jul 13 04:19:39 2011
@@ -166,7 +166,8 @@ public class ServerShutdownHandler exten
       }
     }
 
-    LOG.info("Reassigning " + hris.size() + " region(s) that " + serverName +
+    LOG.info("Reassigning " + (hris == null? 0: hris.size()) +
+      " region(s) that " + serverName +
       " was carrying (skipping " + regionsInTransition.size() +
       " regions(s) that are already in transition)");