Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F9811810C for ; Tue, 15 Sep 2015 21:45:55 +0000 (UTC) Received: (qmail 11675 invoked by uid 500); 15 Sep 2015 21:45:49 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 11649 invoked by uid 500); 15 Sep 2015 21:45:49 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 11640 invoked by uid 99); 15 Sep 2015 21:45:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 21:45:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E1A1DDFDC6; Tue, 15 Sep 2015 21:45:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hyunsik@apache.org To: commits@tajo.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: tajo git commit: TAJO-1848: ShutdownHook in TajoMaster can throw NPE if serviceInit() is failed. Date: Tue, 15 Sep 2015 21:45:48 +0000 (UTC) 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 Authored: Mon Sep 14 14:12:32 2015 -0700 Committer: Hyunsik Choi 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(); }