[jbosscache-commits] JBoss Cache SVN: r7049 - core/trunk/src/main/java/org/jboss/cache/interceptors.

Author: bstansberry(a)jboss.com Date: 2008-11-01 22:55:56 -0400 (Sat, 01 Nov 2008) New Revision: 7049 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyActivationInterceptor.java Log: [JBCACHE-1433] Recurse to bottom of subtree looking for unloaded descendants before removing subtree from persistent store Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyActivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyActivationInterceptor.java 2008-11-02 02:34:59 UTC (rev 7048) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/LegacyActivationInterceptor.java 2008-11-02 02:55:56 UTC (rev 7049) @@ -219,7 +219,7 @@ } } - private static boolean childrenLoaded(NodeSPI<?, ?> node) + private boolean childrenLoaded(NodeSPI<?, ?> node) { if (!node.isChildrenLoaded()) { @@ -231,6 +231,16 @@ { return false; } + + if (child.getChildrenDirect().size() > 0) + { + if (!childrenLoaded(child)) + return false; + } + else if (!loaderNoChildren(child.getFqn())) + { + return false; + } } return true;