Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 55987 invoked from network); 4 Nov 2010 22:35:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Nov 2010 22:35:28 -0000 Received: (qmail 22821 invoked by uid 500); 4 Nov 2010 22:36:00 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 22765 invoked by uid 500); 4 Nov 2010 22:35:59 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 22758 invoked by uid 99); 4 Nov 2010 22:35:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Nov 2010 22:35:59 +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, 04 Nov 2010 22:35:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7D0E238897F; Thu, 4 Nov 2010 22:34:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1031306 - /qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java Date: Thu, 04 Nov 2010 22:34:45 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101104223445.A7D0E238897F@eris.apache.org> Author: robbie Date: Thu Nov 4 22:34:45 2010 New Revision: 1031306 URL: http://svn.apache.org/viewvc?rev=1031306&view=rev Log: QPID-2927: catch and ignore InstanceNotFoundException as this is not unexpected during a clean broker shutdown with the plugin loaded Modified: qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java Modified: qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java?rev=1031306&r1=1031305&r2=1031306&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java (original) +++ qpid/trunk/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java Thu Nov 4 22:34:45 2010 @@ -21,6 +21,7 @@ package org.apache.qpid.shutdown; import java.lang.management.ManagementFactory; +import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -56,7 +57,14 @@ public class Activator implements Bundle // Unregister MBean MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); ObjectName name = new ObjectName(SHUTDOWN_MBEAN_NAME); - mbs.unregisterMBean(name); + try + { + mbs.unregisterMBean(name); + } + catch (InstanceNotFoundException e) + { + //ignore + } _logger.info("Shutdown plugin MBean unregistered"); } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org