Repository: hbase Updated Branches: refs/heads/0.94 6e6dc4bd8 -> 5e587d193
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/5e587d19 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e587d19 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e587d19 Branch: refs/heads/0.94 Commit: 5e587d193db03e1ff99d06c80a4bdf9fea6d0b73 Parents: 6e6dc4b Author: Jonathan M Hsieh <[email protected]> Authored: Mon Dec 15 11:26:55 2014 -0800 Committer: Jonathan M Hsieh <[email protected]> Committed: Mon Dec 15 11:26:55 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/5e587d19/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java b/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java index cd1fd5f..226ffb1 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java @@ -899,7 +899,9 @@ public class SnapshotManager implements Stoppable { } try { - coordinator.close(); + if (coordinator != null) { + coordinator.close(); + } } catch (IOException e) { LOG.error("stop ProcedureCoordinator error", e); }
