Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 56433 invoked from network); 8 Dec 2009 11:15:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Dec 2009 11:15:50 -0000 Received: (qmail 89982 invoked by uid 500); 8 Dec 2009 11:15:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 89948 invoked by uid 500); 8 Dec 2009 11:15:50 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 89939 invoked by uid 99); 8 Dec 2009 11:15:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Dec 2009 11:15:50 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 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, 08 Dec 2009 11:15:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FDDB23888C2; Tue, 8 Dec 2009 11:15:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r888329 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Date: Tue, 08 Dec 2009 11:15:28 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091208111528.5FDDB23888C2@eris.apache.org> Author: dejanb Date: Tue Dec 8 11:15:27 2009 New Revision: 888329 URL: http://svn.apache.org/viewvc?rev=888329&view=rev Log: merging 888323 - https://issues.apache.org/activemq/browse/AMQ-2513 - JMX bug - javax.management.InstanceNotFoundException Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=888329&r1=888328&r2=888329&view=diff ============================================================================== --- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original) +++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Tue Dec 8 11:15:27 2009 @@ -457,7 +457,7 @@ addShutdownHook(); getBroker().start(); if (isUseJmx()) { - if (!getManagementContext().isConnectorStarted()) { + if (getManagementContext().isCreateConnector() && !getManagementContext().isConnectorStarted()) { // try to restart management context // typical for slaves that use the same ports as master managementContext.stop();