[jbosscache-commits] JBoss Cache SVN: r5897 - core/trunk/src/main/java/org/jboss/cache/buddyreplication.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-05-28 10:54:46 -0400 (Wed, 28 May 2008)
New Revision: 5897

Modified:
   core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
Log:
JBCACHE-1353:  State transfer for Buddy Replication does not use configured state transfer timeouts or lock acquisition timeouts

Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java	2008-05-28 14:49:35 UTC (rev 5896)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java	2008-05-28 14:54:46 UTC (rev 5897)
@@ -8,8 +8,14 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.CacheException;
+import org.jboss.cache.CacheSPI;
 import org.jboss.cache.DataContainerImpl;
-import org.jboss.cache.*;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Node;
+import org.jboss.cache.RPCManager;
+import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
 import org.jboss.cache.commands.ReplicableCommand;
 import org.jboss.cache.commands.VisitableCommand;
 import org.jboss.cache.commands.remote.AnnounceBuddyPoolNameCommand;
@@ -498,7 +504,7 @@
       }
 
       if (log.isInfoEnabled()) log.info("Removing self from buddy group " + groupName);
-      
+
       for (Map.Entry<Address, String> me : buddyPool.entrySet())
       {
          if (me.getValue().equals(groupName))
@@ -867,7 +873,7 @@
    {
       // Call _getState with progressively longer timeouts until we
       // get state or it doesn't throw a TimeoutException
-      long[] timeouts = {400, 800, 1600};
+      long[] timeouts = {400, 800, 1600, configuration.getStateRetrievalTimeout()};
       TimeoutException timeoutException = null;
 
       for (int i = 0; i < timeouts.length; i++)