[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3/stateful ...

[Ben Wang]

  User: bwang   
  Date: 06/07/25 02:51:30

  Modified:    src/main/org/jboss/ejb3/stateful   Tag: Branch_4_0
                        ProxiedStatefulBeanContext.java
                        StatefulBeanContext.java
  Log:
  EJBTHREE-660 proper handling of sfsb activtion/passivation event.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +8 -10     jboss-ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxiedStatefulBeanContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/stateful/ProxiedStatefulBeanContext.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -b -r1.1.2.7 -r1.1.2.8
  --- ProxiedStatefulBeanContext.java	24 Jul 2006 16:49:56 -0000	1.1.2.7
  +++ ProxiedStatefulBeanContext.java	25 Jul 2006 06:51:30 -0000	1.1.2.8
  @@ -38,7 +38,7 @@
    * Comment
    * 
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.1.2.7 $
  + * @version $Revision: 1.1.2.8 $
    */
   public class ProxiedStatefulBeanContext extends StatefulBeanContext implements
         Externalizable
  @@ -104,15 +104,13 @@
         parentRef = (StatefulBeanContextReference) in.readObject();
      }
   
  -   public void prePassivate()
  -   {
  -      // noop
  -   }
  -
  -   public void postActivate()
  -   {
  -      // noop
  -   }
  +//   public void prePassivate()
  +//   {
  +//   }
  +
  +//   public void postActivate()
  +//   {
  +//   }
   
      public List<StatefulBeanContext> getContains()
      {
  
  
  
  1.2.2.12  +7 -3      jboss-ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulBeanContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/stateful/StatefulBeanContext.java,v
  retrieving revision 1.2.2.11
  retrieving revision 1.2.2.12
  diff -u -b -r1.2.2.11 -r1.2.2.12
  --- StatefulBeanContext.java	11 May 2006 04:17:42 -0000	1.2.2.11
  +++ StatefulBeanContext.java	25 Jul 2006 06:51:30 -0000	1.2.2.12
  @@ -48,7 +48,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.2.2.11 $
  + * @version $Revision: 1.2.2.12 $
    */
   public class StatefulBeanContext extends BaseContext implements Externalizable
   {
  @@ -180,7 +180,7 @@
   
      public void postActivate()
      {
  -      // container.invokePostActivate(this); handled in getInstance()
  +      getContainer().invokePostActivate(this); // handled in getInstance()
      }
   
      public void popContainedIn()
  @@ -307,7 +307,7 @@
         if (bean == null)
         {
            extractBeanAndInterceptors();
  -         getContainer().invokePostActivate(this);
  +         // getContainer().invokePostActivate(this);
         }
         return bean;
      }
  @@ -352,6 +352,7 @@
               }
            }
            contains = (List<StatefulBeanContext>) beanAndInterceptors[3];
  +/* We should let pm to handle this.
            if (contains != null)
            {
               for (StatefulBeanContext ctx : contains)
  @@ -359,6 +360,7 @@
                  ctx.getContainer().invokePostActivate(ctx);
               }
            }
  +*/
         }
         catch (IOException e)
         {
  @@ -391,6 +393,7 @@
               beanAndInterceptors[2] = list;
            }
            beanAndInterceptors[3] = contains;
  +/* Since replication also uses this. We c'ant call this directly. Let pm handle this.
            if (contains != null)
            {
               for (StatefulBeanContext ctx : contains)
  @@ -398,6 +401,7 @@
                  ctx.prePassivate();
               }
            }
  +*/
            beanMO = new MarshalledObject(beanAndInterceptors);
            out.writeObject(beanMO);
         }