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

[Manik Surtani]

  User: msurtani
  Date: 06/12/15 12:30:32

  Modified:    src/org/jboss/cache/interceptors 
                        PessimisticLockInterceptor.java
  Log:
  refactored
  
  Revision  Changes    Path
  1.38      +13 -8     JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PessimisticLockInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- PessimisticLockInterceptor.java	14 Dec 2006 17:18:48 -0000	1.37
  +++ PessimisticLockInterceptor.java	15 Dec 2006 17:30:32 -0000	1.38
  @@ -37,18 +37,18 @@
    * current method and unlock when the method returns.
    *
    * @author Bela Ban
  - * @version $Id: PessimisticLockInterceptor.java,v 1.37 2006/12/14 17:18:48 msurtani Exp $
  + * @version $Id: PessimisticLockInterceptor.java,v 1.38 2006/12/15 17:30:32 msurtani Exp $
    */
   public class PessimisticLockInterceptor extends Interceptor
   {
  -   TransactionTable tx_table = null;
  +   private TransactionTable tx_table = null;
   
      /**
       * Map<Object, java.util.List>. Keys = threads, values = lists of locks held by that thread
       */
  -   Map lock_table;
  +   private Map lock_table;
      private long lock_acquisition_timeout;
  -   LockManager lockManager = new LockManager();
  +   private LockManager lockManager = new LockManager();
   
   
      public void setCache(CacheSPI cache)
  @@ -190,8 +190,13 @@
            //cache.getRemovedNodesMap().remove(fqn);
            //cache.peek(fqn);
            // do a REAL remove here.
  -         cache.peek(fqn).getNodeSPI().getLock().releaseAll(Thread.currentThread());
  +         Node n = cache.peek(fqn);
  +         if (n != null)
  +         {
  +            lockManager.getLock(n).releaseAll(Thread.currentThread());
  +         }
            ((TreeCacheProxyImpl) cache).realRemove(fqn, true);
  +
         }
         return o;
      }
  @@ -374,7 +379,7 @@
         if (acquired)
         {
            // Record the lock for release on method return or tx commit/rollback
  -         recordNodeLock(gtx, node.getNodeSPI().getLock());
  +         recordNodeLock(gtx, lockManager.getLock(node));
         }
      }
   
  @@ -560,7 +565,7 @@
      {
         boolean acquire(Node node, Object owner, NodeLock.LockType lockType, long timeout) throws InterruptedException
         {
  -         return node.getNodeSPI().getLock().acquire(owner, timeout, lockType);
  +         return getLock(node).acquire(owner, timeout, lockType);
         }
   
         NodeLock getLock(Node node)
  @@ -570,7 +575,7 @@
   
         public Set acquireAll(Node node, Object owner, NodeLock.LockType lockType, long timeout) throws InterruptedException
         {
  -         return node.getNodeSPI().getLock().acquireAll(owner, timeout, lockType);
  +         return getLock(node).acquireAll(owner, timeout, lockType);
         }
      }