[jboss-cvs] JBossCache/src/org/jboss/cache/lock ...

[Manik Surtani]

  User: msurtani
  Date: 06/12/04 19:01:51

  Modified:    src/org/jboss/cache/lock  Tag: Branch_JBossCache_1_4_0
                        IdentityLock.java
  Log:
  ported fixes for JBCACHE-871 and JBCACHE-875 from the 1.3.0 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +7 -3      JBossCache/src/org/jboss/cache/lock/IdentityLock.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IdentityLock.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/IdentityLock.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -b -r1.12 -r1.12.2.1
  --- IdentityLock.java	1 Jun 2006 05:48:03 -0000	1.12
  +++ IdentityLock.java	5 Dec 2006 00:01:51 -0000	1.12.2.1
  @@ -12,7 +12,10 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
   
  -import java.util.*;
  +import java.util.ArrayList;
  +import java.util.Collection;
  +import java.util.Iterator;
  +import java.util.Set;
   
   /**
    * Lock object which grants and releases locks, and associates locks with
  @@ -53,7 +56,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 11, 2003
    * @author Ben Wang July 2003
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.12.2.1 $
    */
   public class IdentityLock
   {
  @@ -94,7 +97,8 @@
            mustReacquireRead_ = false;
         } else {         
            IsolationLevel level = cache.getIsolationLevelClass();
  -         lock_ = LockStrategyFactory.getLockStrategy(level);
  +         // Repeatable Read *is* the default ...
  +         lock_ = LockStrategyFactory.getLockStrategy(level == null ? IsolationLevel.REPEATABLE_READ : level);
            mustReacquireRead_ = (level == IsolationLevel.READ_COMMITTED);
         }
         map_ = new LockMap();