Author: manik.surtani(a)jboss.com Date: 2008-07-15 05:55:21 -0400 (Tue, 15 Jul 2008) New Revision: 6264 Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java Log: Cleaned up unit test failures Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-15 09:42:01 UTC (rev 6263) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-15 09:55:21 UTC (rev 6264) @@ -95,11 +95,18 @@ updateNode(ctx, container, nodeFactory); } - changed = false; - backup = null; + reset(); } } + private void reset() + { + backup = null; + changed = false; + created = false; + deleted = false; + } + /** * Performs a lookup for the parent node of the Fqn passed in. The context is checked first, and failing that, the * data container is consulted. @@ -131,7 +138,7 @@ protected void updateNode(InvocationContext ctx, DataContainer dataContainer, NodeFactory nf) { // swap refs - ((NodeReference) backup).setDelegate(node); + if (!created) ((NodeReference) backup).setDelegate(node); node = backup; } Modified: core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java 2008-07-15 09:42:01 UTC (rev 6263) +++ core/trunk/src/test/java/org/jboss/cache/api/nodevalidity/InvalidatedMvccNodeValidityTest.java 2008-07-15 09:55:21 UTC (rev 6264) @@ -6,7 +6,7 @@ import org.testng.annotations.Test; @Test(groups = {"functional", "mvcc"}) -public class InvalidatedMvccNodeValidityTest extends InvalidatedOptNodeValidityTest +public class InvalidatedMvccNodeValidityTest extends InvalidatedPessNodeValidityTest { public InvalidatedMvccNodeValidityTest() {