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

[Manik Surtani]

  User: msurtani
  Date: 06/12/11 04:17:23

  Modified:    tests/functional/org/jboss/cache/transaction  Tag:
                        Branch_JBossCache_1_4_0 DeadlockTest.java
  Log:
  commented out classic deadlock test
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +6 -3      JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DeadlockTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- DeadlockTest.java	5 May 2006 12:06:59 -0000	1.4
  +++ DeadlockTest.java	11 Dec 2006 09:17:22 -0000	1.4.2.1
  @@ -16,10 +16,10 @@
   import org.jboss.cache.CacheException;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.misc.TestingUtil;
   import org.jboss.cache.lock.IsolationLevel;
   import org.jboss.cache.lock.TimeoutException;
   import org.jboss.cache.lock.UpgradeException;
  +import org.jboss.cache.misc.TestingUtil;
   
   import javax.transaction.NotSupportedException;
   import javax.transaction.SystemException;
  @@ -29,7 +29,7 @@
    * Tests transactional access to a local TreeCache, with concurrent (deadlock-prone) access.
    * Note: we use DummpyTranasctionManager to replace jta
    *
  - * @version $Id: DeadlockTest.java,v 1.4 2006/05/05 12:06:59 msurtani Exp $
  + * @version $Id: DeadlockTest.java,v 1.4.2.1 2006/12/11 09:17:22 msurtani Exp $
    */
   public class DeadlockTest extends TestCase {
      TreeCache   cache=null;
  @@ -125,6 +125,9 @@
         t2.join();
      }
   
  + /*
  +
  + Commented out since JBCACHE-875 onwards, this will end up in a classic deadlock since we lock parent when removing a child.
   
      public void testCreateIfNotExistsLogic() throws CacheException, InterruptedException {
         cache.put(NODE, null);
  @@ -180,7 +183,7 @@
         t0.join();
         t1.join();
      }
  -
  +            */
   
      public void testMoreThanOneUpgrader() throws Exception {
         final int NUM=2;