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

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-05-10 14:33:19 -0400 (Mon, 10 May 2010)
New Revision: 1768

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
Log:
[ISPN-429] (Make sure DefaultConsistentHash replicates addressToHashIds map) Done.

Modified: trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java	2010-05-10 14:41:33 UTC (rev 1767)
+++ trunk/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java	2010-05-10 18:33:19 UTC (rev 1768)
@@ -49,6 +49,7 @@
          positions.put(positionIndex, a);
          // If address appears several times, take the lowest value to guarantee that
          // at least the initial value and subsequent +1 values would end up in the same node
+         // TODO: Remove this check since https://jira.jboss.org/jira/browse/ISPN-428 contains a proper fix for this
          if (!addressToHashIds.containsKey(a))
             addressToHashIds.put(a, positionIndex);
       }
@@ -193,6 +194,7 @@
          DefaultConsistentHash dch = (DefaultConsistentHash) subject;
          output.writeObject(dch.addresses);
          output.writeObject(dch.positions);
+         output.writeObject(dch.addressToHashIds);
       }
 
       @SuppressWarnings("unchecked")
@@ -200,6 +202,7 @@
          DefaultConsistentHash dch = new DefaultConsistentHash();
          dch.addresses = (ArrayList<Address>) unmarshaller.readObject();
          dch.positions = (SortedMap<Integer, Address>) unmarshaller.readObject();
+         dch.addressToHashIds = (Map<Address, Integer>) unmarshaller.readObject();
          return dch;
       }
    }