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

[jbosscache-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2008-09-09 20:01:11 -0400 (Tue, 09 Sep 2008)
New Revision: 6701

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
Log:
Leaf nodes always return isChildrenLoaded = false
Add a workaround


Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java	2008-09-09 18:05:45 UTC (rev 6700)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java	2008-09-10 00:01:11 UTC (rev 6701)
@@ -198,7 +198,7 @@
       }
    }
 
-   private static boolean childrenLoaded(InternalNode<?, ?> node)
+   private boolean childrenLoaded(InternalNode<?, ?> node)
    {
       if (!node.isChildrenLoaded())
       {
@@ -211,8 +211,15 @@
             return false;
          }
 
-         if (!childrenLoaded(child))
+         if (child.hasChildren())
+         {
+            if (!childrenLoaded(child))
+               return false;
+         }
+         else if (!loaderNoChildren(child.getFqn()))
+         {
             return false;
+         }
       }
       return true;