You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/09/15 23:45:48 UTC
tajo git commit: TAJO-1848: ShutdownHook in TajoMaster can throw NPE
if serviceInit() is failed.
Repository: tajo
Updated Branches:
refs/heads/master 882eaa66a -> 59fe67841
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/59fe6784
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/59fe6784
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/59fe6784
Branch: refs/heads/master
Commit: 59fe6784187a5940622c52f537844f235d1c5b61
Parents: 882eaa6
Author: Hyunsik Choi <hy...@apache.org>
Authored: Mon Sep 14 14:12:32 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Mon Sep 14 14:12:32 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/59fe6784/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();
}