Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 41685 invoked from network); 23 Jul 2009 17:03:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jul 2009 17:03:31 -0000 Received: (qmail 69516 invoked by uid 500); 23 Jul 2009 17:04:35 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 69455 invoked by uid 500); 23 Jul 2009 17:04:35 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 69446 invoked by uid 99); 23 Jul 2009 17:04:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2009 17:04:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 23 Jul 2009 17:04:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7372723888DA; Thu, 23 Jul 2009 17:04:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r797147 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java Date: Thu, 23 Jul 2009 17:04:11 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090723170411.7372723888DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mamta Date: Thu Jul 23 17:04:11 2009 New Revision: 797147 URL: http://svn.apache.org/viewvc?rev=797147&view=rev Log: DERBY-4306 registeredMbeans is null but we do not check for nullability before executing following if (registeredMbeans.remove(mbeanName) == null) which resulted in NPE. I have fixed the problem by checking for nullability first. registeredMbeans will be null if someone shuts down the engine first and then later on issues a command to shutdown the server. During the shutdown, registeredMbeans will be null and we should check for that nullability before accessing it. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java?rev=797147&r1=797146&r2=797147&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/jmx/JMXManagementService.java Thu Jul 23 17:04:11 2009 @@ -283,6 +283,10 @@ */ private synchronized void unregisterMBean(final ObjectName mbeanName) { + //Has this service been shut down? + if (registeredMbeans == null) + return; + if (registeredMbeans.remove(mbeanName) == null) return;