commit 4037c8de59598b3241bcf2060aea6f253176d782
author Andrew Kyle Purtell <apurtell@apache.org> Tue Aug 27 05:25:06 2013 +0000
committer Andrew Kyle Purtell <apurtell@apache.org> Tue Aug 27 05:25:06 2013 +0000
tree e158ddcea0b2ba2ad062870eb24a8a064c2ca90e
parent 288d155609c002d508af55abed9eb17886504e50

HBASE-9349. [0.92] NPE in HMaster during shutdown

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.92@1517752 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/hadoop/hbase/master/HMaster.java

diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 229fde7..8c8ab31 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1507,10 +1507,12 @@
       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);
     }