svn commit: r833442 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java

[dejanb-2]

Author: dejanb
Date: Fri Nov  6 15:33:13 2009
New Revision: 833442

URL: http://svn.apache.org/viewvc?rev=833442&view=rev
Log:
merging 833441: additional fix for https://issues.apache.org/activemq/browse/AMQ-2306 - jmx for slave brokers

Modified:
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=833442&r1=833441&r2=833442&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Fri Nov  6 15:33:13 2009
@@ -213,7 +213,7 @@
     }
 
     public boolean isConnectorStarted() {
- return connectorServer.isActive();
+ return connectorServer != null && connectorServer.isActive();
  }
 
  /**