[jbosscache-commits] JBoss Cache SVN: r6715 - core/support-branches/1.4.1.SP9_JBCACHE-1406/src/org/jboss/cache.

[jbosscache-commits at lists.jboss.org]

Author: jiwils
Date: 2008-09-12 17:53:44 -0400 (Fri, 12 Sep 2008)
New Revision: 6715

Modified:
   core/support-branches/1.4.1.SP9_JBCACHE-1406/src/org/jboss/cache/TreeCache.java
Log:
Added Takayoshi's patch for JBPAPP-1171 and JBCACHE-1406.

Modified: core/support-branches/1.4.1.SP9_JBCACHE-1406/src/org/jboss/cache/TreeCache.java
===================================================================
--- core/support-branches/1.4.1.SP9_JBCACHE-1406/src/org/jboss/cache/TreeCache.java	2008-09-12 21:48:34 UTC (rev 6714)
+++ core/support-branches/1.4.1.SP9_JBCACHE-1406/src/org/jboss/cache/TreeCache.java	2008-09-12 21:53:44 UTC (rev 6715)
@@ -4304,7 +4304,11 @@
       {
          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
-         Iterator iterator = n.getChildren(true).values().iterator();
+         Map children = n.getChildren(true);
+         if (children == null) {
+             return;
+         }
+         Iterator iterator = children.values().iterator();
          while (iterator.hasNext())
          {
             DataNode data = (DataNode) iterator.next();