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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-13 10:27:41 -0500 (Fri, 13 Nov 2009)
New Revision: 1169

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
Log:
DIST should work even if there is just 1 node

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-11-13 15:26:39 UTC (rev 1168)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-11-13 15:27:41 UTC (rev 1169)
@@ -50,6 +50,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.HashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -213,14 +214,22 @@
    }
 
    public boolean isLocal(Object key) {
+      if (consistentHash == null) return true;
       return consistentHash.isKeyLocalToAddress(self, key, replCount);
    }
 
    public List<Address> locate(Object key) {
+      if (consistentHash == null) return Collections.singletonList(self);
       return consistentHash.locate(key, replCount);
    }
 
    public Map<Object, List<Address>> locateAll(Collection<Object> keys) {
+      if (consistentHash == null) {
+         Map<Object, List<Address>> m = new HashMap<Object, List<Address>>(keys.size());
+         List<Address> selfList = Collections.singletonList(self);
+         for (Object k: keys) m.put(k, selfList);
+         return m;
+      }
       return consistentHash.locateAll(keys, replCount);
    }