[infinispan-commits] Infinispan SVN: r1767 - trunk/core/src/main/java/org/infinispan/distribution.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-05-10 10:41:33 -0400 (Mon, 10 May 2010)
New Revision: 1767

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
Log:
[ISPN-428] (A fix for duplicate addresses in a ConsistentHash implementation)

Modified: trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2010-05-10 14:32:24 UTC (rev 1766)
+++ trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2010-05-10 14:41:33 UTC (rev 1767)
@@ -114,7 +114,11 @@
             throw new CacheException("Unable to retrieve old consistent hash from coordinator even after several attempts at sleeping and retrying!");
 
          // 2.  new CH instance
-         chNew = createConsistentHash(configuration, chOld.getCaches(), self);
+         if (chOld.getCaches().contains(self))
+            chNew = chOld;
+         else
+            chNew = createConsistentHash(configuration, chOld.getCaches(), self);
+         
          dmi.setConsistentHash(chNew);
 
          if (configuration.isRehashEnabled()) {