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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-25 15:21:21 -0400 (Tue, 25 Aug 2009)
New Revision: 736

Modified:
   trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
Log:
Removed infinite loop

Modified: trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-08-25 14:49:48 UTC (rev 735)
+++ trunk/core/src/main/java/org/infinispan/distribution/DistributionManagerImpl.java	2009-08-25 19:21:21 UTC (rev 736)
@@ -250,11 +250,7 @@
 
    @ManagedOperation(description = "Determines whether a given key is affected by an ongoing rehash, if any.")
    public boolean isAffectedByRehash(Object key) {
-      if (transactionLogger.isEnabled() && oldConsistentHash != null && !oldConsistentHash.locate(key, replCount).contains(self)) {
-         return true;
-      } else {
-         return false;
-      }
+      return transactionLogger.isEnabled() && oldConsistentHash != null && !oldConsistentHash.locate(key, replCount).contains(self);
    }
 
    public TransactionLogger getTransactionLogger() {
@@ -373,7 +369,7 @@
    }
 
    @ManagedOperation(description = "Tells you whether a given key is local to this instance of the cache.  Only works with String keys.")
-   public boolean isLocal(String key) {
+   public boolean isLocatedLocally(String key) {
       return isLocal(key);
    }