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

[Manik Surtani]

  User: msurtani
  Date: 06/12/06 06:36:15

  Modified:    src/org/jboss/cache/interceptors  Tag:
                        Branch_JBossCache_1_3_0
                        PessimisticLockInterceptor.java
  Log:
  gtx test
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.11 +2 -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.14.2.10
  retrieving revision 1.14.2.11
  diff -u -b -r1.14.2.10 -r1.14.2.11
  --- PessimisticLockInterceptor.java	6 Dec 2006 10:57:53 -0000	1.14.2.10
  +++ PessimisticLockInterceptor.java	6 Dec 2006 11:36:15 -0000	1.14.2.11
  @@ -34,7 +34,7 @@
    * scope of the TX. When no TX is present, we keep track of the locks acquired during the current method and unlock
    * when the method returns
    * @author Bela Ban
  - * @version $Id: PessimisticLockInterceptor.java,v 1.14.2.10 2006/12/06 10:57:53 msurtani Exp $
  + * @version $Id: PessimisticLockInterceptor.java,v 1.14.2.11 2006/12/06 11:36:15 msurtani Exp $
    */
   public class PessimisticLockInterceptor extends Interceptor {
      TransactionTable           tx_table=null;
  @@ -244,7 +244,7 @@
            }
   
            // reverse the "remove" if the node has been previously removed in the same tx, if this operation is a put()
  -         if (needToReverseRemove(child_node, tx_table.get(gtx), lock_type, isRemoveNodeOperation, createIfNotExists))
  +         if (gtx!=null && needToReverseRemove(child_node, tx_table.get(gtx), lock_type, isRemoveNodeOperation, createIfNotExists))
            {
               reverseRemove(child_node);
            }