activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [2/2] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5621
Date Tue, 10 May 2016 14:05:32 GMT
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 <tabish121@gmail.com>
Authored: Tue May 10 10:05:05 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
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();
         }
 


Mime
View raw message