From 4993f827271740df13783f07d69a0b0ebd8c8122 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 8 Dec 2009 11:15:27 +0000
Subject: [PATCH] merging 888323 -
 https://issues.apache.org/activemq/browse/AMQ-2513 - JMX bug -
 javax.management.InstanceNotFoundException

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@888329 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/activemq/broker/BrokerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index 8fc83bdeb8..68aeff24a3 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -457,7 +457,7 @@ public class BrokerService implements Service {
             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();