You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2013/08/27 07:25:06 UTC
svn commit: r1517752 -
/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Author: apurtell
Date: Tue Aug 27 05:25:06 2013
New Revision: 1517752
URL: http://svn.apache.org/r1517752
Log:
HBASE-9349. [0.92] NPE in HMaster during shutdown
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1517752&r1=1517751&r2=1517752&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Aug 27 05:25:06 2013
@@ -1507,10 +1507,12 @@ Server {
MBeanUtil.unregisterMBean(mxBean);
mxBean = null;
}
- this.assignmentManager.shutdown();
- this.serverManager.shutdownCluster();
+ if (this.assignmentManager != null) this.assignmentManager.shutdown();
+ if (this.serverManager != null) this.serverManager.shutdownCluster();
try {
- this.clusterStatusTracker.setClusterDown();
+ if (this.clusterStatusTracker != null){
+ this.clusterStatusTracker.setClusterDown();
+ }
} catch (KeeperException e) {
LOG.error("ZooKeeper exception trying to set cluster as down in ZK", e);
}