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

[Manik Surtani]

  User: msurtani
  Date: 07/03/12 15:06:43

  Modified:    src/org/jboss/cache/interceptors 
                        OptimisticNodeInterceptor.java
  Log:
  JBCACHE-1006
  
  Revision  Changes    Path
  1.56      +6 -1      JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticNodeInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -b -r1.55 -r1.56
  --- OptimisticNodeInterceptor.java	27 Feb 2007 18:26:15 -0000	1.55
  +++ OptimisticNodeInterceptor.java	12 Mar 2007 19:06:43 -0000	1.56
  @@ -340,8 +340,13 @@
         WorkspaceNode parentNode = getOrCreateWorkspaceNode(parentFqn, workspace, false);
         if (parentNode == null)
         {
  +         // chk if this has been removed in the same tx
  +         parentNode = workspace.getNode(parentFqn);
  +         if (parentNode == null || !parentNode.isDeleted())
  +         {
            throw new NodeNotExistsException("Unable to find parent node with Fqn " + parentFqn);
         }
  +      }
   
         parentNode.removeChild(new Fqn(workspaceNode.getFqn().getLastElement()));
         workspace.addNode(parentNode);