hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject hbase git commit: HBASE-12692 NPE from SnapshotManager#stop (Ashish Singhi)
Date Mon, 15 Dec 2014 19:23:01 GMT
Repository: hbase
Updated Branches:
  refs/heads/master afb753ecc -> 3a652ba41


HBASE-12692 NPE from SnapshotManager#stop (Ashish Singhi)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3a652ba4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3a652ba4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3a652ba4

Branch: refs/heads/master
Commit: 3a652ba41c86aa566ea5377234611888da5a8bd8
Parents: afb753e
Author: Jonathan M Hsieh <jmhsieh@apache.org>
Authored: Mon Dec 15 11:17:59 2014 -0800
Committer: Jonathan M Hsieh <jmhsieh@apache.org>
Committed: Mon Dec 15 11:17:59 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/3a652ba4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
----------------------------------------------------------------------
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 d2e11a2..b7a891d 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);
     }


Mime
View raw message