[jbosscache-commits] JBoss Cache SVN: r6691 - in core/branches/1.4.X: src/org/jboss/cache and 2 other directories.
Author: mircea.markus
Date: 2008-09-04 10:25:23 -0400 (Thu, 04 Sep 2008)
New Revision: 6691
Modified:
core/branches/1.4.X/build.xml
core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveOnTxTest.java
core/branches/1.4.X/tests/functional/org/jboss/cache/transaction/IsolationLevelReadUncommitedTest.java
Log:
fix for http://jira.jboss.com/jira/browse/JBCACHE-1384
Modified: core/branches/1.4.X/build.xml
===================================================================
--- core/branches/1.4.X/build.xml 2008-09-04 14:12:45 UTC (rev 6690)
+++ core/branches/1.4.X/build.xml 2008-09-04 14:25:23 UTC (rev 6691)
@@ -392,7 +392,7 @@
<target name="one-test-aop" depends="generateClassLoader,
compile,unittests-init"
description="Runs a single unit test">
- <junit printsummary="yes" timeout="${junit.timeout}"
fork="yes">
+ <junit printsummary="yes" timeout="${junit.timeout}"
fork="yes" maxmemory="512">
<jvmarg
value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
<!-- start of Optimizeit support
Modified: core/branches/1.4.X/src/org/jboss/cache/TreeCache.java
===================================================================
--- core/branches/1.4.X/src/org/jboss/cache/TreeCache.java 2008-09-04 14:12:45 UTC (rev
6690)
+++ core/branches/1.4.X/src/org/jboss/cache/TreeCache.java 2008-09-04 14:25:23 UTC (rev
6691)
@@ -4307,6 +4307,12 @@
else
{
if (log.isDebugEnabled()) log.debug("Node " + f + " NOT marked
for removal as expected, not removing!");
+ //also check whether children are marked for deletion, JBCACHE-1406
+ for (Object o : n.getChildren(true).values())
+ {
+ DataNode data = (DataNode) o;
+ realRemove(data.getFqn(), skipMarkerCheck);
+ }
}
}
Modified: core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveOnTxTest.java
===================================================================
--- core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveOnTxTest.java 2008-09-04
14:12:45 UTC (rev 6690)
+++ core/branches/1.4.X/tests/functional/org/jboss/cache/RemoveOnTxTest.java 2008-09-04
14:25:23 UTC (rev 6691)
@@ -69,7 +69,7 @@
print("get(): " + cache.get("/a/b/c", "test"));
tm.commit();
assertTrue(cache.peek(Fqn.fromString("/a/b/c")) == null);
- assertTrue(cache.exists("/a/b/c"));
+ assertTrue(!cache.exists("/a/b/c"));
assertTrue(cache.exists("/a/b/d"));
cache.printLockInfo();
} catch (Exception ex)
Modified:
core/branches/1.4.X/tests/functional/org/jboss/cache/transaction/IsolationLevelReadUncommitedTest.java
===================================================================
---
core/branches/1.4.X/tests/functional/org/jboss/cache/transaction/IsolationLevelReadUncommitedTest.java 2008-09-04
14:12:45 UTC (rev 6690)
+++
core/branches/1.4.X/tests/functional/org/jboss/cache/transaction/IsolationLevelReadUncommitedTest.java 2008-09-04
14:25:23 UTC (rev 6691)
@@ -13,7 +13,6 @@
/**
* @author Mircea.Markus(a)jboss.com
- * @since 2.2
*/
public class IsolationLevelReadUncommitedTest extends TestCase {