[jboss-cvs] JBossAS SVN: r62818 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-05-05 01:20:04 -0400 (Sat, 05 May 2007)
New Revision: 62818

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
Log:
[EJBTHREE-956] Replicate a removed bean if live nested children prevent removing it

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-04 23:50:52 UTC (rev 62817)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java	2007-05-05 05:20:04 UTC (rev 62818)
@@ -239,7 +239,16 @@
                pool.remove(ctx);
             
             if (ctx.getCanRemoveFromCache())
+            {
+               // Do a cluster-wide removal of the ctx
                cache.remove(id);
+            }
+            else 
+            {
+               // We can't remove the ctx as it contains live nested beans
+               // But, we must replicate it so other nodes know the parent is removed!
+               putInCache(ctx);
+            }
             
             ++removeCount;
             beans.remove(key);