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

[jg...@apache.org]

Author: jgray
Date: Wed Nov 10 05:35:51 2010
New Revision: 1033360

URL: http://svn.apache.org/viewvc?rev=1033360&view=rev
Log:
HBASE-3213 If do abort of backup master will get NPE instead of graceful abort

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1033360&r1=1033359&r2=1033360&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Nov 10 05:35:51 2010
@@ -669,6 +669,8 @@ Release 0.90.0 - Unreleased
                place; i.e. that only one enable/disable runs at a time
    HBASE-2898  MultiPut makes proper error handling impossible and leads to 
    	       corrupted data
+   HBASE-3213  If do abort of backup master will get NPE instead of graceful
+               abort
 
 
   IMPROVEMENTS

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1033360&r1=1033359&r2=1033360&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed Nov 10 05:35:51 2010
@@ -279,7 +279,8 @@ implements HMasterInterface, HMasterRegi
       stopChores();
       // Wait for all the remaining region servers to report in IFF we were
       // running a cluster shutdown AND we were NOT aborting.
-      if (!this.abort && this.serverManager.isClusterShutdown()) {
+      if (!this.abort && this.serverManager != null &&
+          this.serverManager.isClusterShutdown()) {
         this.serverManager.letRegionServersShutdown();
       }
       stopServiceThreads();