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

[Manik Surtani]

  User: msurtani
  Date: 07/06/19 14:49:32

  Modified:    tests/functional/org/jboss/cache/loader 
                        CacheLoaderTestsBase.java
  Log:
  FCL should use exclusive locks even for reads
  
  Revision  Changes    Path
  1.52      +47 -46    JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderTestsBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- CacheLoaderTestsBase.java	19 Jun 2007 13:05:18 -0000	1.51
  +++ CacheLoaderTestsBase.java	19 Jun 2007 18:49:32 -0000	1.52
  @@ -34,7 +34,7 @@
    * Commons tests for all CacheLoaders
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderTestsBase.java,v 1.51 2007/06/19 13:05:18 msurtani Exp $
  + * @version $Id: CacheLoaderTestsBase.java,v 1.52 2007/06/19 18:49:32 msurtani Exp $
    */
   abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
   {
  @@ -94,12 +94,34 @@
               e.printStackTrace();
            }
         }
  +      cleanup();
  +      try
  +      {
         cache.remove("/");
  -      loader.remove(Fqn.fromString("/"));
  +      }
  +      catch (Exception e)
  +      {
  +         // do nothing
  +      }
  +
  +      try
  +      {
  +         loader.remove(Fqn.ROOT);
  +      }
  +      catch (Exception e)
  +      {
  +         // do nothing
  +      }
  +
         cache.stop();
         cache.destroy();
      }
   
  +   protected void cleanup()
  +   {
  +      // to be overridden
  +   }
  +
      protected void addDelay()
      {
         // returns immediately in this case.  Subclasses may override where a delay is needed.
  @@ -2137,26 +2159,6 @@
                  latch.await();
                  for (int i = 0; i < loops; i++)
                  {
  -                  loader.getChildrenNames(singleFqn ? fqn.getParent() : fqns.get(r.nextInt(fqns.size())).getParent());
  -               }
  -            }
  -            catch (Exception e)
  -            {
  -               exceptions.add(e);
  -            }
  -         }
  -      };
  -      reader2.start();
  -
  -      Thread reader3 = new Thread("Reader-3")
  -      {
  -         public void run()
  -         {
  -            try
  -            {
  -               latch.await();
  -               for (int i = 0; i < loops; i++)
  -               {
                     loader.getChildrenNames(singleFqn ? fqn : fqns.get(r.nextInt(fqns.size())));
                  }
               }
  @@ -2166,7 +2168,7 @@
               }
            }
         };
  -      reader3.start();
  +      reader2.start();
   
   
         Thread writer1 = new Thread("Writer-1")
  @@ -2213,7 +2215,6 @@
         latch.countDown();
         reader1.join();
         reader2.join();
  -      reader3.join();
         remover1.join();
         remover2.join();
         writer1.join();