Repository: falcon Updated Branches: refs/heads/master 7421c7756 -> cbd7c807e
FALCON-1443 NPE in shutdown hook. Contributed by Pallavi Rao. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/cbd7c807 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/cbd7c807 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/cbd7c807 Branch: refs/heads/master Commit: cbd7c807e4fbc5ced48923529cbb29e3af7b4dfc Parents: 7421c77 Author: Ajay Yadava <[email protected]> Authored: Mon Sep 14 10:42:57 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Mon Sep 14 10:42:57 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ prism/src/main/java/org/apache/falcon/Main.java | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/cbd7c807/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5f60fb1..688c3c4 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,8 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-1443 NPE in shutdown hook(Pallavi Rao via Ajay Yadava) + FALCON-1445 Docfix for api/instance/dependencies endpoint(Raghav Kumar Gautam via Ajay Yadava) FALCON-1381 The webservice response of Falcon includes a stack trace in case of errors(Narayan Periwal via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/cbd7c807/prism/src/main/java/org/apache/falcon/Main.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/Main.java b/prism/src/main/java/org/apache/falcon/Main.java index d8bbfbd..b0f19ae 100644 --- a/prism/src/main/java/org/apache/falcon/Main.java +++ b/prism/src/main/java/org/apache/falcon/Main.java @@ -66,8 +66,13 @@ public final class Main { public void run() { try { LOG.info("calling shutdown hook"); - server.stop(); - broker.stop(); + if (server != null) { + server.stop(); + } + if (broker != null) { + broker.stop(); + } + LOG.info("Shutdown Complete."); } catch (Exception e) { LOG.error("Server shutdown failed with " , e); }
