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

[Manik Surtani]

  User: msurtani
  Date: 06/12/10 12:15:46

  Modified:    src/org/jboss/cache/interceptors  Tag:
                        Branch_JBossCache_1_4_0
                        PessimisticLockInterceptor.java
  Log:
  fixed order of remove for non tx call, to ensure proper notifications
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.5  +4 -2      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.20.2.4
  retrieving revision 1.20.2.5
  diff -u -b -r1.20.2.4 -r1.20.2.5
  --- PessimisticLockInterceptor.java	6 Dec 2006 11:44:22 -0000	1.20.2.4
  +++ PessimisticLockInterceptor.java	10 Dec 2006 17:15:46 -0000	1.20.2.5
  @@ -36,7 +36,7 @@
    * current method and unlock when the method returns.
    *
    * @author Bela Ban
  - * @version $Id: PessimisticLockInterceptor.java,v 1.20.2.4 2006/12/06 11:44:22 msurtani Exp $
  + * @version $Id: PessimisticLockInterceptor.java,v 1.20.2.5 2006/12/10 17:15:46 msurtani Exp $
    */
   public class PessimisticLockInterceptor extends Interceptor
   {
  @@ -185,6 +185,8 @@
         if (m.getMethodId() == MethodDeclarations.lockMethodLocal_id)
            return null;
   
  +      Object o = super.invoke(m);
  +
         // FIXME this should be done in UnlockInterceptor, but I didn't want
         // to add the removedNodes map to TreeCache
         if (storeLockedNode && ctx.getGlobalTransaction() == null)
  @@ -195,7 +197,7 @@
            cache.realRemove(fqn, true);
         }
   
  -      return super.invoke(m);
  +      return o;
      }