Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 802FB102FD for ; Tue, 27 Aug 2013 05:25:46 +0000 (UTC) Received: (qmail 75962 invoked by uid 500); 27 Aug 2013 05:25:45 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 74026 invoked by uid 500); 27 Aug 2013 05:25:34 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 73958 invoked by uid 99); 27 Aug 2013 05:25:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 05:25:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 05:25:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA7292388831; Tue, 27 Aug 2013 05:25:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1517752 - /hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Date: Tue, 27 Aug 2013 05:25:06 -0000 To: commits@hbase.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130827052506.EA7292388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apurtell Date: Tue Aug 27 05:25:06 2013 New Revision: 1517752 URL: http://svn.apache.org/r1517752 Log: HBASE-9349. [0.92] NPE in HMaster during shutdown Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1517752&r1=1517751&r2=1517752&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Aug 27 05:25:06 2013 @@ -1507,10 +1507,12 @@ Server { MBeanUtil.unregisterMBean(mxBean); mxBean = null; } - this.assignmentManager.shutdown(); - this.serverManager.shutdownCluster(); + if (this.assignmentManager != null) this.assignmentManager.shutdown(); + if (this.serverManager != null) this.serverManager.shutdownCluster(); try { - this.clusterStatusTracker.setClusterDown(); + if (this.clusterStatusTracker != null){ + this.clusterStatusTracker.setClusterDown(); + } } catch (KeeperException e) { LOG.error("ZooKeeper exception trying to set cluster as down in ZK", e); }