[jboss-cvs] JBossAS SVN: r60650 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful.

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

Author: bstansberry at jboss.com
Date: 2007-02-19 03:57:46 -0500 (Mon, 19 Feb 2007)
New Revision: 60650

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
Log:
[EJBTHREE-867] Loosen coupling of lifecycle of nested SFSBs

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	2007-02-19 08:55:39 UTC (rev 60649)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContextReference.java	2007-02-19 08:57:46 UTC (rev 60650)
@@ -35,6 +35,9 @@
  */
 public class StatefulBeanContextReference implements Externalizable
 {
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 2644760020735482423L;
+   
    private transient StatefulBeanContext beanContext;
    private Object oid;
    private String containerId;
@@ -69,7 +72,9 @@
       if (beanContext == null)
       {
          StatefulContainer container = (StatefulContainer)Ejb3Registry.getContainer(containerId);
-         beanContext = container.getCache().get(oid);
+         // We are willing to accept a context that has been marked as removed
+         // as it can still hold nested children
+         beanContext = container.getCache().get(oid, false);
       }
       return beanContext;
    }