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:25:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 290eca5cd -> 4617b13a7


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/4617b13a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4617b13a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4617b13a

Branch: refs/heads/0.98
Commit: 4617b13a7f9f6924995b56c975f9d386f1cfaeaf
Parents: 290eca5
Author: Jonathan M Hsieh <jmhsieh@apache.org>
Authored: Mon Dec 15 11:17:59 2014 -0800
Committer: Jonathan M Hsieh <jon@cloudera.com>
Committed: Mon Dec 15 11:23:44 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/4617b13a/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 ef4c5e8..11621d3 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
@@ -908,7 +908,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