You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/12/08 12:15:28 UTC

svn commit: r888329 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

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();