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

[Elias Ross]

  User: genman  
  Date: 07/02/07 17:06:49

  Modified:    src/org/jboss/cache/lock     IdentityLock.java
                        IsolationLevel.java LockUtil.java NodeLock.java
  Log:
  JBCACHE-969 - Move transaction classes to org.jboss.cache.transaction
  
  Revision  Changes    Path
  1.22      +6 -4      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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- IdentityLock.java	29 Jan 2007 15:47:58 -0000	1.21
  +++ IdentityLock.java	7 Feb 2007 22:06:49 -0000	1.22
  @@ -14,6 +14,7 @@
   
   import java.util.ArrayList;
   import java.util.Collection;
  +import java.util.Collections;
   import java.util.HashSet;
   import java.util.Iterator;
   import java.util.Set;
  @@ -59,7 +60,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 11, 2003
    * @author Ben Wang July 2003
  - * @version $Revision: 1.21 $
  + * @version $Revision: 1.22 $
    */
   public class IdentityLock implements NodeLock
   {
  @@ -528,16 +529,17 @@
         }
      }
   
  -   public Set acquireAll(Object caller, long timeout, LockType lock_type)
  +   public Set<NodeLock> acquireAll(Object caller, long timeout, LockType lock_type)
              throws LockingException, TimeoutException, InterruptedException
      {
         boolean acquired;
  -      Set retval = new HashSet();
   
         if (lock_type == LockType.NONE)
         {
  -         return retval;
  +         return Collections.emptySet();
         }
  +      
  +      Set<NodeLock> retval = new HashSet<NodeLock>();      
         acquired = acquire(caller, timeout, lock_type);
         if (acquired)
         {
  
  
  
  1.9       +5 -1      JBossCache/src/org/jboss/cache/lock/IsolationLevel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: IsolationLevel.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/IsolationLevel.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- IsolationLevel.java	18 Jan 2007 17:04:03 -0000	1.8
  +++ IsolationLevel.java	7 Feb 2007 22:06:49 -0000	1.9
  @@ -1,15 +1,19 @@
   /**
    *
    * @author Bela Ban Nov 25, 2003
  - * @version $Id: IsolationLevel.java,v 1.8 2007/01/18 17:04:03 msurtani Exp $
  + * @version $Id: IsolationLevel.java,v 1.9 2007/02/07 22:06:49 genman Exp $
    */
   package org.jboss.cache.lock;
   
   /**
    * Various transaction isolation levels as an enumerated class.
  + * @see http://en.wikipedia.org/wiki/Isolation_%28computer_science%29
    */
   public enum IsolationLevel
   {
  +   /**
  +    * No isolation.
  +    */
      NONE,
      SERIALIZABLE,
      REPEATABLE_READ,
  
  
  
  1.8       +2 -2      JBossCache/src/org/jboss/cache/lock/LockUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LockUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/LockUtil.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- LockUtil.java	4 Jan 2007 05:35:40 -0000	1.7
  +++ LockUtil.java	7 Feb 2007 22:06:49 -0000	1.8
  @@ -3,11 +3,11 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.CacheImpl;
  -import org.jboss.cache.GlobalTransaction;
   import org.jboss.cache.Node;
   import org.jboss.cache.NodeSPI;
  -import org.jboss.cache.TransactionTable;
   import org.jboss.cache.statetransfer.StateTransferManager;
  +import org.jboss.cache.transaction.GlobalTransaction;
  +import org.jboss.cache.transaction.TransactionTable;
   
   import javax.transaction.Status;
   import javax.transaction.Transaction;
  
  
  
  1.2       +113 -103  JBossCache/src/org/jboss/cache/lock/NodeLock.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeLock.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/lock/NodeLock.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- NodeLock.java	20 Nov 2006 03:53:55 -0000	1.1
  +++ NodeLock.java	7 Feb 2007 22:06:49 -0000	1.2
  @@ -96,7 +96,17 @@
      boolean acquire(Object caller, long timeout, NodeLock.LockType lock_type) throws LockingException, TimeoutException,
            InterruptedException;
   
  -   Set acquireAll(Object caller, long timeout, NodeLock.LockType lock_type) throws LockingException, TimeoutException,
  +   /**
  +    * Recursively acquire locks for this node and all subnodes.
  +    * @param caller lock owner
  +    * @param timeout time to wait
  +    * @param lock_type type of lock
  +    * @return locks acquired
  +    * @throws LockingException
  +    * @throws TimeoutException
  +    * @throws InterruptedException
  +    */
  +   Set<NodeLock> acquireAll(Object caller, long timeout, NodeLock.LockType lock_type) throws LockingException, TimeoutException,
            InterruptedException;
   
      void printLockInfo(StringBuffer sb, int indent);