[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/pojo/statetransfer ...

[Manik Surtani]

  User: msurtani
  Date: 07/01/30 21:40:23

  Modified:    tests/functional/org/jboss/cache/pojo/statetransfer 
                        StateTransferAopTestBase.java
  Log:
  Removed dependency on concurrent.jar
  
  Revision  Changes    Path
  1.2       +7 -6      JBossCache/tests/functional/org/jboss/cache/pojo/statetransfer/StateTransferAopTestBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferAopTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/pojo/statetransfer/StateTransferAopTestBase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- StateTransferAopTestBase.java	13 Jan 2007 15:55:06 -0000	1.1
  +++ StateTransferAopTestBase.java	31 Jan 2007 02:40:23 -0000	1.2
  @@ -7,7 +7,6 @@
   
   package org.jboss.cache.pojo.statetransfer;
   
  -import EDU.oswego.cs.dl.util.concurrent.Semaphore;
   import junit.framework.TestCase;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -36,12 +35,14 @@
   import java.util.Map;
   import java.util.Random;
   import java.util.Set;
  +import java.util.concurrent.Semaphore;
  +import java.util.concurrent.TimeUnit;
   
   /**
    * Tests state transfer in PojoCache.
    *
    * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public abstract class StateTransferAopTestBase extends TestCase
   {
  @@ -348,7 +349,7 @@
            // we know the threads are done
            for (int i = 0; i < count; i++)
            {
  -            boolean acquired = semaphore.attempt(60000);
  +            boolean acquired = semaphore.tryAcquire(60, TimeUnit.SECONDS);
               if (!acquired)
                  fail("failed to acquire semaphore " + i);
            }
  @@ -493,7 +494,7 @@
                  stressors[i].stopPuts();
                  log.info("TEST: Run " + x + "-- /" + names[i] + " activated on A");
                  // Reacquire one semaphore ticket
  -               boolean acquired = semaphore.attempt(60000);
  +               boolean acquired = semaphore.tryAcquire(60, TimeUnit.SECONDS);
                  if (!acquired)
                     fail("failed to acquire semaphore " + names[i]);
                  log.info("TEST: Run " + x + "-- acquired semaphore from " + names[i]);
  @@ -879,7 +880,7 @@
               {
                  if (i > 0)
                  {
  -                  acquired = semaphore.attempt(60000);
  +                  acquired = semaphore.tryAcquire(60, TimeUnit.SECONDS);
                     if (!acquired)
                        throw new Exception(name + " cannot acquire semaphore");
                     log.info("TEST: " + name + " reacquired semaphore");
  @@ -1017,7 +1018,7 @@
            boolean acquired = false;
            try
            {
  -            acquired = semaphore.attempt(60000);
  +            acquired = semaphore.tryAcquire(60, TimeUnit.SECONDS);
               if (!acquired)
                  throw new Exception(name + " cannot acquire semaphore");
               log.info("TEST: " + name + " acquired semaphore");