[jbosscache-commits] JBoss Cache SVN: r4949 - core/trunk/src/main/java/org/jboss/cache/invocation.
Author: manik.surtani(a)jboss.com
Date: 2008-01-02 19:17:12 -0500 (Wed, 02 Jan 2008)
New Revision: 4949
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
Log:
JBCACHE-1241 - removing root should not attempt to clear internal Fqns.
Modified:
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-01-02
23:09:38 UTC (rev 4948)
+++
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-01-03
00:17:12 UTC (rev 4949)
@@ -418,10 +418,14 @@
// we need to preserve options
InvocationContext ctx = getInvocationContext();
Option o = ctx.getOptionOverrides();
+ Set<Fqn> internalFqns = getInternalFqns();
for (Object childName : peek(fqn, false, false).getChildrenNames())
{
- ctx.setOptionOverrides(o);
- result = removeNode(new Fqn<Object>((Fqn<Object>) fqn,
childName)) && result;
+ if (!internalFqns.contains(new Fqn(childName)))
+ {
+ ctx.setOptionOverrides(o);
+ result = removeNode(new Fqn<Object>((Fqn<Object>) fqn,
childName)) && result;
+ }
}
return result;