Repository: tajo Updated Branches: refs/heads/branch-0.11.0 48c7c195a -> 9db963d12
TAJO-1848: ShutdownHook in TajoMaster can throw NPE if serviceInit() is failed. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/9db963d1 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/9db963d1 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/9db963d1 Branch: refs/heads/branch-0.11.0 Commit: 9db963d121225611da03300a42ee49a6a427e5c0 Parents: 48c7c19 Author: Hyunsik Choi <[email protected]> Authored: Mon Sep 14 14:12:32 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Tue Sep 15 14:46:31 2015 -0700 ---------------------------------------------------------------------- tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/9db963d1/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java index 1197e98..ed7698f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java @@ -544,7 +544,8 @@ public class TajoMaster extends CompositeService { stop(); // If embedded derby is used as catalog, shutdown it. - if (catalogServer.getStoreClassName().equals("org.apache.tajo.catalog.store.DerbyStore") + if (catalogServer != null && + catalogServer.getStoreClassName().equals("org.apache.tajo.catalog.store.DerbyStore") && AbstractDBStore.needShutdown(catalogServer.getStoreUri())) { DerbyStore.shutdown(); }
