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

[Manik Surtani]

  User: msurtani
  Date: 06/12/11 13:00:48

  Modified:    src/org/jboss/cache/interceptors  Tag:
                        Branch_JBossCache_1_4_0
                        PessimisticLockInterceptor.java
  Log:
  fixed pojocache oddities
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.6  +8 -1      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.5
  retrieving revision 1.20.2.6
  diff -u -b -r1.20.2.5 -r1.20.2.6
  --- PessimisticLockInterceptor.java	10 Dec 2006 17:15:46 -0000	1.20.2.5
  +++ PessimisticLockInterceptor.java	11 Dec 2006 18:00:48 -0000	1.20.2.6
  @@ -36,7 +36,7 @@
    * current method and unlock when the method returns.
    *
    * @author Bela Ban
  - * @version $Id: PessimisticLockInterceptor.java,v 1.20.2.5 2006/12/10 17:15:46 msurtani Exp $
  + * @version $Id: PessimisticLockInterceptor.java,v 1.20.2.6 2006/12/11 18:00:48 msurtani Exp $
    */
   public class PessimisticLockInterceptor extends Interceptor
   {
  @@ -387,6 +387,13 @@
         {
            Object child_name = fqn.get(i);
            DataNode child_node = (DataNode) n.getOrCreateChild(child_name, gtx, true);
  +         // test if this node needs to be 'undeleted'
  +         // reverse the "remove" if the node has been previously removed in the same tx, if this operation is a put()
  +         if (gtx != null && needToReverseRemove(child_node, tx_table.get(gtx), DataNode.LOCK_TYPE_WRITE, false, true))
  +         {
  +            reverseRemove(child_node);
  +         }
  +
            if (child_node == null)
            {
               if (log.isTraceEnabled())