[jboss-cvs] JBossAS SVN: r80328 - projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-11-01 21:13:58 -0400 (Sat, 01 Nov 2008)
New Revision: 80328

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/ForcePassivationCache.java
Log:
[EJBTHREE-1549] Do not allow PRE_PASSIVATE_BARRIER to timeout in the Cache, may break the test

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/ForcePassivationCache.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/ForcePassivationCache.java	2008-11-01 21:38:47 UTC (rev 80327)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree1549/ForcePassivationCache.java	2008-11-02 01:13:58 UTC (rev 80328)
@@ -24,8 +24,6 @@
 import java.io.Serializable;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
 import org.jboss.ejb3.stateful.StatefulBeanContext;
@@ -224,7 +222,7 @@
          
          try
          {
-            PRE_PASSIVATE_BARRIER.await(5, TimeUnit.SECONDS);
+            PRE_PASSIVATE_BARRIER.await();
          }
          catch (BrokenBarrierException e)
          {
@@ -234,10 +232,6 @@
          {
             throw new RuntimeException(e);
          }
-         catch(TimeoutException e)
-         {
-            throw new RuntimeException(e);
-         }
       }
    }