From 3a652ba41c86aa566ea5377234611888da5a8bd8 Mon Sep 17 00:00:00 2001
From: Jonathan M Hsieh <jmhsieh@apache.org>
Date: Mon, 15 Dec 2014 11:17:59 -0800
Subject: [PATCH] HBASE-12692 NPE from SnapshotManager#stop (Ashish Singhi)

---
 .../apache/hadoop/hbase/master/snapshot/SnapshotManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
index d2e11a22e06..b7a891d01ba 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
@@ -927,7 +927,9 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable
       restoreHandler.cancel(why);
     }
     try {
-      coordinator.close();
+      if (coordinator != null) {
+        coordinator.close();
+      }
     } catch (IOException e) {
       LOG.error("stop ProcedureCoordinator error", e);
     }