[jbosscache-commits] JBoss Cache SVN: r5682 - in core/trunk/src/main/java/org/jboss/cache: invocation and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-04-25 06:44:38 -0400 (Fri, 25 Apr 2008)
New Revision: 5682

Modified:
   core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java
   core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java
Log:
JBCACHE-1222 - fixed eviction issue

Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java	2008-04-25 09:49:39 UTC (rev 5681)
+++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java	2008-04-25 10:44:38 UTC (rev 5682)
@@ -62,6 +62,7 @@
       this.isOptimistic = configuration.isNodeLockingOptimistic();
    }
 
+   //todo - why is this method using optimisticLocking param, as it NEVER gets called in an optimistic cache as it is intercepted
    public Object perform(InvocationContext ctx)
    {
       NodeSPI parentNode;

Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java	2008-04-25 09:49:39 UTC (rev 5681)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java	2008-04-25 10:44:38 UTC (rev 5682)
@@ -205,6 +205,11 @@
       }
       else
       {
+         if (node == null)
+         {
+            result.add(parent);
+            return result;
+         }
          buildNodesForEviction(node, result);
       }
       return result;