Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DBE517723 for ; Sun, 27 Sep 2015 06:05:36 +0000 (UTC) Received: (qmail 90120 invoked by uid 500); 27 Sep 2015 06:05:36 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 90069 invoked by uid 500); 27 Sep 2015 06:05:36 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 89857 invoked by uid 99); 27 Sep 2015 06:05:36 -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; Sun, 27 Sep 2015 06:05:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B22AADF97F; Sun, 27 Sep 2015 06:05:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pxiong@apache.org To: commits@hive.apache.org Date: Sun, 27 Sep 2015 06:05:36 -0000 Message-Id: <3cef2118f9db49bc81ff9ded98a8de76@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hive git commit: HIVE-9566: HiveServer2 fails to start with NullPointerException (Na via Xuefu) HIVE-9566: HiveServer2 fails to start with NullPointerException (Na via Xuefu) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/37206a49 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/37206a49 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/37206a49 Branch: refs/heads/branch-1.0 Commit: 37206a49f1f6e12f3ac997bb04d3b383ae7781e1 Parents: 0b511ca Author: Xuefu Zhang Authored: Tue Jun 30 05:15:40 2015 -0700 Committer: Pengcheng Xiong Committed: Sat Sep 26 22:04:13 2015 -0700 ---------------------------------------------------------------------- service/src/java/org/apache/hive/service/server/HiveServer2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/37206a49/service/src/java/org/apache/hive/service/server/HiveServer2.java ---------------------------------------------------------------------- diff --git a/service/src/java/org/apache/hive/service/server/HiveServer2.java b/service/src/java/org/apache/hive/service/server/HiveServer2.java index 17e1d85..4f44987 100644 --- a/service/src/java/org/apache/hive/service/server/HiveServer2.java +++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java @@ -267,7 +267,7 @@ public class HiveServer2 extends CompositeService { HiveConf hiveConf = this.getHiveConf(); super.stop(); // Remove this server instance from ZooKeeper if dynamic service discovery is set - if (hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) { + if (hiveConf != null && hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) { try { removeServerInstanceFromZooKeeper(); } catch (Exception e) { @@ -276,7 +276,7 @@ public class HiveServer2 extends CompositeService { } // There should already be an instance of the session pool manager. // If not, ignoring is fine while stopping HiveServer2. - if (hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_TEZ_INITIALIZE_DEFAULT_SESSIONS)) { + if (hiveConf != null && hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_TEZ_INITIALIZE_DEFAULT_SESSIONS)) { try { TezSessionPoolManager.getInstance().stop(); } catch (Exception e) {