Author: manik.surtani(a)jboss.com
Date: 2008-04-21 19:15:43 -0400 (Mon, 21 Apr 2008)
New Revision: 5610
Modified:
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
Log:
Fixed JBCACHE-1329, double removal of nodes
Modified:
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
---
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21
23:15:00 UTC (rev 5609)
+++
core/branches/2.1.X/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-21
23:15:43 UTC (rev 5610)
@@ -338,7 +338,7 @@
if (workspaceNode == null) return false;
Fqn parentFqn = workspaceNode.getFqn().getParent();
- WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, true,
true);
+ WorkspaceNode parentNode = fetchWorkspaceNode(ctx, parentFqn, workspace, false,
true);
if (parentNode == null) throw new NodeNotExistsException("Unable to find
parent node with fqn " + parentFqn);
// pre-notify
@@ -551,9 +551,9 @@
if (trace) log.trace("Node " + fqn + " has been deleted in the
workspace.");
if (undeleteIfNecessary)
{
- undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(),
workspace, true, includeInvalidNodes));
+ undeleteWorkspaceNode(workspaceNode, fetchWorkspaceNode(ctx, fqn.getParent(),
workspace, undeleteIfNecessary, includeInvalidNodes));
}
- else
+ else if (!includeInvalidNodes)
{
// don't return deleted nodes if undeleteIfNecessary is false!
workspaceNode = null;
Show replies by date