Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B69F71882A for ; Fri, 11 Mar 2016 12:02:28 +0000 (UTC) Received: (qmail 69958 invoked by uid 500); 11 Mar 2016 12:02:28 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 69921 invoked by uid 500); 11 Mar 2016 12:02:28 -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 69912 invoked by uid 99); 11 Mar 2016 12:02:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Mar 2016 12:02:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33779DFC11; Fri, 11 Mar 2016 12:02:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-6208 - fix and test Date: Fri, 11 Mar 2016 12:02:28 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/master 57264bf8d -> ae441cbc7 https://issues.apache.org/jira/browse/AMQ-6208 - fix and test Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ae441cbc Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ae441cbc Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ae441cbc Branch: refs/heads/master Commit: ae441cbc7dc8d656990cefae28657eed78cf28e0 Parents: 57264bf Author: gtully Authored: Fri Mar 11 12:01:18 2016 +0000 Committer: gtully Committed: Fri Mar 11 12:01:18 2016 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/broker/jmx/ConnectorView.java | 2 +- .../src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ae441cbc/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java index 51d104b..907829d 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ConnectorView.java @@ -98,7 +98,7 @@ public class ConnectorView implements ConnectorViewMBean { */ @Override public boolean isUpdateClusterClients() { - return this.connector.isUpdateClusterClientsOnRemove(); + return this.connector.isUpdateClusterClients(); } /** http://git-wip-us.apache.org/repos/asf/activemq/blob/ae441cbc/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java index e03cb46..5304424 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java @@ -820,6 +820,8 @@ public class MBeanTest extends EmbeddedBrokerTestSupport { super.setUp(); ManagementContext managementContext = broker.getManagementContext(); mbeanServer = managementContext.getMBeanServer(); + + broker.getTransportConnectorByScheme("tcp").setUpdateClusterClientsOnRemove(true); } @Override @@ -1518,7 +1520,7 @@ public class MBeanTest extends EmbeddedBrokerTestSupport { assertNotNull(connector); assertFalse(connector.isRebalanceClusterClients()); - assertFalse(connector.isUpdateClusterClientsOnRemove()); + assertTrue(connector.isUpdateClusterClientsOnRemove()); assertFalse(connector.isUpdateClusterClients()); assertFalse(connector.isAllowLinkStealingEnabled()); }