Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 44451 invoked from network); 6 Nov 2009 15:33:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Nov 2009 15:33:37 -0000 Received: (qmail 53336 invoked by uid 500); 6 Nov 2009 15:33:37 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 53292 invoked by uid 500); 6 Nov 2009 15:33:37 -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 53283 invoked by uid 99); 6 Nov 2009 15:33:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2009 15:33:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Fri, 06 Nov 2009 15:33:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC85823888E7; Fri, 6 Nov 2009 15:33:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833442 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Date: Fri, 06 Nov 2009 15:33:13 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091106153313.CC85823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); } /**