From bf91745bf509cf6277f934a4c8be05032cdf6e03 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 6 Nov 2009 15:29:40 +0000
Subject: [PATCH] additional fix for
 https://issues.apache.org/activemq/browse/AMQ-2306 - jmx for slave brokers

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@833441 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/activemq/broker/jmx/ManagementContext.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
index a170f6d012..985ebabb1a 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
@@ -217,7 +217,7 @@ public class ManagementContext implements Service {
     }
 
     public boolean isConnectorStarted() {
-		return connectorServer.isActive();
+		return connectorServer != null && connectorServer.isActive();
 	}
 
 	/**