Repository: hbase Updated Branches: refs/heads/branch-1 88d1ddffd -> 7cf86b62a
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/7cf86b62 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7cf86b62 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7cf86b62 Branch: refs/heads/branch-1 Commit: 7cf86b62a725f46fba8a0da47312f9b7ae185e3c Parents: 88d1ddf Author: Jonathan M Hsieh <[email protected]> Authored: Mon Dec 15 11:17:59 2014 -0800 Committer: Jonathan M Hsieh <[email protected]> Committed: Mon Dec 15 11:23:18 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/7cf86b62/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 52c73a8..44435a2 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 @@ -901,7 +901,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); }
