[infinispan-commits] Infinispan SVN: r686 - in trunk/core/src: test/java/org/infinispan/distribution and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-14 08:52:23 -0400 (Fri, 14 Aug 2009)
New Revision: 686

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
   trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
Log:
Fixed timing bug

Modified: trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2009-08-14 10:20:28 UTC (rev 685)
+++ trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2009-08-14 12:52:23 UTC (rev 686)
@@ -108,6 +108,7 @@
 
          // 2.  new CH instance
          chNew = createConsistentHash(chOld.getCaches(), self);
+         dmi.setConsistentHash(chNew);
 
          // 3.  Enable TX logging
          transactionLogger.enable();

Modified: trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java	2009-08-14 10:20:28 UTC (rev 685)
+++ trunk/core/src/test/java/org/infinispan/distribution/DistAsyncTxFuncTest.java	2009-08-14 12:52:23 UTC (rev 686)
@@ -11,7 +11,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -22,7 +21,7 @@
    ReplListener r1, r2, r3, r4;
    ReplListener[] r;
    Map<Cache<?, ?>, ReplListener> listenerLookup;
-   List<Address> listenerCaches = new LinkedList<Address>();
+   List<Address> listenerCaches;
 
    public DistAsyncTxFuncTest() {
       sync = false;
@@ -40,6 +39,7 @@
       r4 = new ReplListener(c4, true, true);
       r = new ReplListener[]{r1, r2, r3, r4};
       listenerLookup = new HashMap<Cache<?, ?>, ReplListener>();
+      listenerCaches = new ArrayList<Address>();
       for (ReplListener rl : r) {
          listenerCaches.add(addressOf(rl.getCache()));
          listenerLookup.put(rl.getCache(), rl);