activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject [4/4] activemq git commit: allow multicast to work via perfer ip4 and more sensible delays
Date Fri, 23 Jan 2015 13:09:40 GMT
allow multicast to work via perfer ip4 and more sensible delays


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f38cb588
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f38cb588
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f38cb588

Branch: refs/heads/trunk
Commit: f38cb588d3d85a1f7bb3e9a98308c9aeef4c5c2d
Parents: de549f8
Author: gtully <gary.tully@gmail.com>
Authored: Fri Jan 23 13:08:03 2015 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Jan 23 13:08:03 2015 +0000

----------------------------------------------------------------------
 activemq-unit-tests/pom.xml                                        | 1 +
 .../activemq/transport/discovery/DiscoveryTransportBrokerTest.java | 2 +-
 .../transport/discovery/DiscoveryTransportNoBrokerTest.java        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f38cb588/activemq-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 1b08d6f..6d69954 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -442,6 +442,7 @@
             <exclude>**/SimpleDispatchPolicyTest.java</exclude>
           </excludes>
           <systemPropertyVariables>
+            <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
             <org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
             <org.apache.activemq.AutoFailTestSupport.disableSystemExit>true</org.apache.activemq.AutoFailTestSupport.disableSystemExit>
           </systemPropertyVariables>

http://git-wip-us.apache.org/repos/asf/activemq/blob/f38cb588/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
index 339cdaa..2f77109 100755
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
@@ -144,7 +144,7 @@ public class DiscoveryTransportBrokerTest extends NetworkTestSupport {
     }
 
     protected StubConnection createFailoverConnection() throws Exception {
-        URI failoverURI = new URI("discovery:(" + getDiscoveryUri() + ")?startupMaxReconnectAttempts=5");
+        URI failoverURI = new URI("discovery:(" + getDiscoveryUri() + ")?startupMaxReconnectAttempts=10&initialReconnectDelay=1000");
         Transport transport = TransportFactory.connect(failoverURI);
         StubConnection connection = new StubConnection(transport);
         connections.add(connection);

http://git-wip-us.apache.org/repos/asf/activemq/blob/f38cb588/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java
index 8126327..7ba24db 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportNoBrokerTest.java
@@ -64,7 +64,7 @@ public class DiscoveryTransportNoBrokerTest extends CombinationTestSupport
{
        final int noConnectionToCreate = 10;
         for (int i=0; i<10;i++) {
             ActiveMQConnectionFactory factory =
-                new ActiveMQConnectionFactory("discovery:(multicast://239.255.2.3:6155?group="
+ group +")?closeAsync=false&startupMaxReconnectAttempts=5");
+                new ActiveMQConnectionFactory("discovery:(multicast://239.255.2.3:6155?group="
+ group +")?closeAsync=false&startupMaxReconnectAttempts=10&initialReconnectDelay=1000");
             LOG.info("Connecting.");
             Connection connection = factory.createConnection();
             connection.setClientID("test");


Mime
View raw message