[jbosscache-commits] JBoss Cache SVN: r5612 - in core/trunk/src: main/java/org/jboss/cache/transaction and 2 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-04-21 19:39:34 -0400 (Mon, 21 Apr 2008)
New Revision: 5612

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
   core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java
   core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
   core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java
Log:
Fixed various issues

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java	2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java	2008-04-21 23:39:34 UTC (rev 5612)
@@ -87,7 +87,7 @@
    {
       GlobalTransaction gtx = getGlobalTransaction(ctx);
       TransactionWorkspace workspace = getTransactionWorkspace(gtx);
-      WorkspaceNode workspaceNode = fetchWorkspaceNode(ctx, command.getFqn(), workspace, true, true);
+      WorkspaceNode workspaceNode = fetchWorkspaceNode(ctx, command.getFqn(), workspace, false, true);
       if (workspaceNode != null)
       {
          setVersioning(ctx, workspace, workspaceNode);
@@ -464,7 +464,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
@@ -567,9 +567,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;

Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java	2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java	2008-04-21 23:39:34 UTC (rev 5612)
@@ -246,6 +246,8 @@
                log.trace("releasing lock for " + lock.getFqn() + " (" + lock + ")");
             }
          }
+
+         locks.clear();
       }
    }
 

Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java	2008-04-21 23:39:34 UTC (rev 5612)
@@ -375,8 +375,7 @@
       tm.begin();
       assertEquals(cache.get("/foo/1/2/3", "item"), 1);
       cache.removeNode("/foo/1");
-      cache.exists("/foo/1");
-      assertFalse(cache.exists("/foo/1"));
+      assertNull(cache.getNode("/foo/1"));
       assertNull(cache.get("/foo/1", "item"));
       cache.removeNode("/foo/1/2/3");
       assertNull(cache.get("/foo/1/2/3", "item"));

Modified: core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java	2008-04-21 23:17:47 UTC (rev 5611)
+++ core/trunk/src/test/java/org/jboss/cache/optimistic/NodeInterceptorRemoveDataTest.java	2008-04-21 23:39:34 UTC (rev 5612)
@@ -2,6 +2,7 @@
 
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.commands.tx.CommitCommand;
 import org.jboss.cache.interceptors.OptimisticCreateIfNotExistsInterceptor;
 import org.jboss.cache.interceptors.OptimisticNodeInterceptor;
 import org.jboss.cache.interceptors.base.ChainedInterceptor;
@@ -85,7 +86,7 @@
       assertTrue(entry.getLocks().isEmpty());
       assertEquals(0, entry.getModifications().size());
       assertTrue(!cache.exists("/one/two"));
-      assertEquals(null, dummy.getCalledCommand());
+      assertEquals(CommitCommand.class, dummy.getCalledCommand().getClass());
    }
 
    public void testTransactionRemoveEmptyMethod() throws Exception