[jbosscache-commits] JBoss Cache SVN: r8233 - in core/trunk/src: test/java/org/jboss/cache/statetransfer and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-09-17 10:55:54 -0400 (Thu, 17 Sep 2009)
New Revision: 8233

Modified:
   core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/NBSTCacheLoaderTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/NonBlockingStateTransferTest.java
   core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java
Log:
[JBCACHE-1538] - removed endless loop and re-enabled tests

Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2009-09-17 13:50:31 UTC (rev 8232)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java	2009-09-17 14:55:54 UTC (rev 8233)
@@ -231,20 +231,9 @@
 
       public void lockProcessingLock() throws InterruptedException
       {
-         while (true)
-         {
-            try
-            {
-               if (!coordinationLock.readLock().tryLock(configuration.getStateRetrievalTimeout(), TimeUnit.MILLISECONDS))
-                  throw new TimeoutException("Could not obtain processing lock");
+         if (!coordinationLock.readLock().tryLock(configuration.getStateRetrievalTimeout(), TimeUnit.MILLISECONDS))
+            throw new TimeoutException("Could not obtain processing lock");
 
-               return;
-            }
-            catch (InterruptedException ie)
-            {
-               Thread.currentThread().interrupt();
-            }
-         }
       }
 
       public void unlockProcessingLock()

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/NBSTCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/NBSTCacheLoaderTest.java	2009-09-17 13:50:31 UTC (rev 8232)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/NBSTCacheLoaderTest.java	2009-09-17 14:55:54 UTC (rev 8233)
@@ -12,7 +12,7 @@
 
 import java.io.IOException;
 
- at Test(groups = "functional", testName = "statetransfer.NBSTCacheLoaderTest", enabled = false)
+ at Test(groups = "functional", testName = "statetransfer.NBSTCacheLoaderTest", enabled = true)
 public class NBSTCacheLoaderTest extends NonBlockingStateTransferTest
 {
    int id;

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/NonBlockingStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/NonBlockingStateTransferTest.java	2009-09-17 13:50:31 UTC (rev 8232)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/NonBlockingStateTransferTest.java	2009-09-17 14:55:54 UTC (rev 8233)
@@ -26,7 +26,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
- at Test(groups="functional", testName = "statetransfer.NonBlockingStateTransferTest", enabled = false)
+ at Test(groups="functional", testName = "statetransfer.NonBlockingStateTransferTest", enabled = true)
 public class NonBlockingStateTransferTest
 {
    public static final Fqn A = Fqn.fromString("/a");

Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java	2009-09-17 13:50:31 UTC (rev 8232)
+++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransfer200Test.java	2009-09-17 14:55:54 UTC (rev 8233)
@@ -29,7 +29,7 @@
  * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a>
  * @version $Revision$
  */
- at Test(groups = {"functional"}, testName = "statetransfer.StateTransfer200Test", enabled = false)
+ at Test(groups = {"functional"}, testName = "statetransfer.StateTransfer200Test", enabled = true)
 public class StateTransfer200Test extends StateTransferTestBase
 {
    protected String getReplicationVersion()