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

[Manik Surtani]

  User: msurtani
  Date: 06/12/30 12:49:58

  Modified:    src/org/jboss/cache/lock  LockUtil.java
  Log:
  Major changes to restructure cache and node object model
  
  Revision  Changes    Path
  1.6       +4 -4      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- LockUtil.java	8 Dec 2006 18:50:49 -0000	1.5
  +++ LockUtil.java	30 Dec 2006 17:49:58 -0000	1.6
  @@ -2,10 +2,10 @@
   
   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.TransactionTable;
  -import org.jboss.cache.TreeCache;
   import org.jboss.cache.statetransfer.StateTransferManager;
   
   import javax.transaction.Status;
  @@ -25,7 +25,7 @@
      public static boolean breakTransactionLock(NodeLock lock,
                                                 GlobalTransaction gtx,
                                                 boolean localTx,
  -                                              TreeCache cache)
  +                                              CacheImpl cache)
      {
         TransactionTable tx_table = cache.getTransactionTable();
         TransactionManager tm = cache.getTransactionManager();
  @@ -62,7 +62,7 @@
       */
      public static void forceAcquireLock(Node node,
                                          Object newOwner,
  -                                       TreeCache cache,
  +                                       CacheImpl cache,
                                          boolean lockChildren)
      {
   
  @@ -123,7 +123,7 @@
         // Recursively unlock children
         if (lockChildren)
         {
  -         for (Node n: node.getChildren())
  +         for (Node n : node.getChildren())
            {
               forceAcquireLock(n, newOwner, cache, true);
            }