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

[Manik Surtani]

  User: msurtani
  Date: 07/03/05 14:15:56

  Modified:    src/org/jboss/cache/interceptors 
                        PessimisticLockInterceptor.java
  Log:
  JBCACHE-999
  
  Revision  Changes    Path
  1.50      +10 -15    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.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- PessimisticLockInterceptor.java	27 Feb 2007 21:57:36 -0000	1.49
  +++ PessimisticLockInterceptor.java	5 Mar 2007 19:15:56 -0000	1.50
  @@ -36,7 +36,7 @@
    * current method and unlock when the method returns.
    *
    * @author Bela Ban
  - * @version $Id: PessimisticLockInterceptor.java,v 1.49 2007/02/27 21:57:36 msurtani Exp $
  + * @version $Id: PessimisticLockInterceptor.java,v 1.50 2007/03/05 19:15:56 msurtani Exp $
    */
   public class PessimisticLockInterceptor extends Interceptor
   {
  @@ -209,7 +209,8 @@
            ((CacheImpl) cache).realRemove(fqn, true);
   
         }
  -      else if (m.getMethodId() == MethodDeclarations.commitMethod_id || isOnePhaseCommitPrepareMehod(m) || m.getMethodId() == MethodDeclarations.rollbackMethod_id)
  +      else
  +      if (m.getMethodId() == MethodDeclarations.commitMethod_id || isOnePhaseCommitPrepareMehod(m) || m.getMethodId() == MethodDeclarations.rollbackMethod_id)
         {
            cleanup(ctx.getGlobalTransaction());
         }
  @@ -257,11 +258,6 @@
            return;
         }
   
  -      if (fqn.isRoot())
  -      {
  -         return;
  -      }
  -
         if (configuration.getIsolationLevel() == IsolationLevel.NONE)
         {
            lock_type = NodeLock.LockType.NONE;
  @@ -493,11 +489,11 @@
   
         // first remove nodes that should be deleted.
         Iterator removedNodes = entry.getRemovedNodes().iterator();
  -      CacheImpl tcpi = (CacheImpl) cache;
  +      CacheImpl cacheImpl = (CacheImpl) cache;
         while (removedNodes.hasNext())
         {
            Fqn f = (Fqn) removedNodes.next();
  -         tcpi.realRemove(f, false);
  +         cacheImpl.realRemove(f, false);
         }
      }
   
  @@ -542,13 +538,12 @@
            return;
         }
   
  -
         Iterator removedNodes = entry.getRemovedNodes().iterator();
  -      CacheImpl tcpi = (CacheImpl) cache;
  +      CacheImpl cacheImpl = (CacheImpl) cache;
         while (removedNodes.hasNext())
         {
            Fqn f = (Fqn) removedNodes.next();
  -         tcpi.realRemove(f, false);
  +         cacheImpl.realRemove(f, false);
   
         }