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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-14 10:57:17 -0400 (Fri, 14 Aug 2009)
New Revision: 693

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
Log:
fixed npe

Modified: trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2009-08-14 14:44:58 UTC (rev 692)
+++ trunk/core/src/main/java/org/infinispan/distribution/JoinTask.java	2009-08-14 14:57:17 UTC (rev 693)
@@ -88,21 +88,23 @@
             log.trace("Requesting old consistent hash from coordinator");
             List<Response> resp = rpcManager.invokeRemotely(coordinator(), commandsFactory.buildGetConsistentHashCommand(self),
                                                             ResponseMode.SYNCHRONOUS, 100000, true);
+            List<Address> addresses = null;
             for (Response r : resp) {
                if (r instanceof SuccessfulResponse) {
-                  List<Address> list = (List<Address>) ((SuccessfulResponse) r).getResponseValue();
-                  chOld = createConsistentHash(list);
+                  addresses = (List<Address>) ((SuccessfulResponse) r).getResponseValue();
                   break;
                }
             }
 
-            log.trace("Retrieved old consistent hash {0}", chOld);
-            if (chOld == null) {
+            log.trace("Retrieved old consistent hash address list {0}", addresses);
+            if (addresses == null) {
                if (sleepTime > maxSleepTime)
                   throw new CacheException("Unable to retrieve old consistent hash from coordinator even after several attempts at sleeping and retrying!");
                log.debug("Sleeping for {0}", Util.prettyPrintTime(sleepTime));
                Thread.sleep(sleepTime); // sleep for a while and retry
                sleepTime *= incrementFactor;
+            } else {
+               chOld = createConsistentHash(addresses);
             }
          } while (chOld == null);