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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-10-27 11:40:05 -0400 (Tue, 27 Oct 2009)
New Revision: 1032

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
Log:
Test for Union CH before attempting to calculate distances between nodes.

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-10-27 14:33:06 UTC (rev 1031)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-10-27 15:40:05 UTC (rev 1032)
@@ -204,7 +204,8 @@
    }
 
    boolean willReceiveLeaverState(Address leaver) {
-      int dist = consistentHash.getDistance(leaver, self);
+      ConsistentHash ch = consistentHash instanceof UnionConsistentHash ? oldConsistentHash : consistentHash;
+      int dist = ch.getDistance(leaver, self);
       return dist <= replCount;
    }