[hornetq-commits] JBoss hornetq SVN: r11332 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/cluster/distribution and 1 other directory.
Author: clebert.suconic(a)jboss.com
Date: 2011-09-12 16:59:11 -0400 (Mon, 12 Sep 2011)
New Revision: 11332
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
trying to fix discovery tests
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
===================================================================
---
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-09-12
18:07:09 UTC (rev 11331)
+++
branches/Branch_2_2_EAP/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2011-09-12
20:59:11 UTC (rev 11332)
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.hornetq.api.core.HornetQBuffer;
import org.hornetq.api.core.HornetQBuffers;
@@ -66,7 +67,7 @@
private final Object waitLock = new Object();
- private final Map<String, DiscoveryEntry> connectors = new HashMap<String,
DiscoveryEntry>();
+ private final Map<String, DiscoveryEntry> connectors = new
ConcurrentHashMap<String, DiscoveryEntry>();
private final long timeout;
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
---
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-09-12
18:07:09 UTC (rev 11331)
+++
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-09-12
20:59:11 UTC (rev 11332)
@@ -1657,7 +1657,7 @@
-1,
groupAddress,
port,
- 1000,
+ 200,
connectorPairs);
configuration.getBroadcastGroupConfigurations().add(bcConfig);