Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 955D22007D0 for ; Tue, 10 May 2016 16:05:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 93BCC160A11; Tue, 10 May 2016 14:05:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E5E3D16098A for ; Tue, 10 May 2016 16:05:32 +0200 (CEST) Received: (qmail 97461 invoked by uid 500); 10 May 2016 14:05:32 -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 97449 invoked by uid 99); 10 May 2016 14:05:32 -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; Tue, 10 May 2016 14:05:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5636DFDE3; Tue, 10 May 2016 14:05:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Date: Tue, 10 May 2016 14:05:32 -0000 Message-Id: <996afc50887f4bfab00f5110bb6c06b2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5621 archived-at: Tue, 10 May 2016 14:05:33 -0000 https://issues.apache.org/jira/browse/AMQ-5621 Remove hard coded port as the bridge brokers method doesn't need the port to be fixed. Turn off JMX since the test doesn't use it. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3da9b072 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3da9b072 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3da9b072 Branch: refs/heads/master Commit: 3da9b0720efa4f8c55b8d04d3b584637a25ac1da Parents: 809d5b9 Author: Timothy Bish Authored: Tue May 10 10:05:05 2016 -0400 Committer: Timothy Bish Committed: Tue May 10 10:05:05 2016 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/bugs/AMQ4147Test.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/3da9b072/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java index cf7ca45..7e5e14e 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4147Test.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.activemq.bugs; import java.net.URI; @@ -37,6 +36,7 @@ import org.apache.activemq.util.Wait; * manipulated by the remote broker. */ public class AMQ4147Test extends JmsMultipleBrokersTestSupport { + /** * This test demonstrates the bug: namely, when a message is bridged over * the VMTransport, its memory usage continues to refer to the originating @@ -46,10 +46,10 @@ public class AMQ4147Test extends JmsMultipleBrokersTestSupport { */ public void testVMTransportRemoteMemoryUsage() throws Exception { BrokerService broker1 = createBroker(new URI( - "broker:(vm://broker1)/broker1?persistent=false")); + "broker:(vm://broker1)/broker1?persistent=false&useJmx=false")); BrokerService broker2 = createBroker(new URI( - "broker:(vm://broker2)/broker2?persistent=false")); + "broker:(vm://broker2)/broker2?persistent=false&useJmx=false")); startAllBrokers(); @@ -106,8 +106,7 @@ public class AMQ4147Test extends JmsMultipleBrokersTestSupport { })); assertTrue(broker2TestQueue.getMemoryUsage().getUsage() > 0); } finally { - // Consume the message and verify that there is no more memory - // usage. + // Consume the message and verify that there is no more memory usage. consumerProceed.release(); } @@ -131,10 +130,10 @@ public class AMQ4147Test extends JmsMultipleBrokersTestSupport { */ public void testTcpTransportRemoteMemoryUsage() throws Exception { BrokerService broker1 = createBroker(new URI( - "broker:(vm://broker1)/broker1?persistent=false")); + "broker:(vm://broker1)/broker1?persistent=false&useJmx=false")); BrokerService broker2 = createBroker(new URI( - "broker:(tcp://localhost:61616)/broker2?persistent=false")); + "broker:(tcp://localhost:0)/broker2?persistent=false&useJmx=false")); startAllBrokers(); @@ -189,8 +188,7 @@ public class AMQ4147Test extends JmsMultipleBrokersTestSupport { })); assertTrue(broker2TestQueue.getMemoryUsage().getUsage() > 0); } finally { - // Consume the message and verify that there is no more memory - // usage. + // Consume the message and verify that there is no more memory usage. consumerProceed.release(); }