[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 06/09/25 20:29:53

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  fix bugs in PC handling
  
  Revision  Changes    Path
  1.163     +8 -9      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.162
  retrieving revision 1.163
  diff -u -b -r1.162 -r1.163
  --- Component.java	23 Sep 2006 15:41:39 -0000	1.162
  +++ Component.java	26 Sep 2006 00:29:53 -0000	1.163
  @@ -75,8 +75,8 @@
   import org.jboss.seam.interceptors.ExceptionInterceptor;
   import org.jboss.seam.interceptors.Interceptor;
   import org.jboss.seam.interceptors.JavaBeanInterceptor;
  +import org.jboss.seam.interceptors.ManagedEntityIdentityInterceptor;
   import org.jboss.seam.interceptors.OutcomeInterceptor;
  -import org.jboss.seam.interceptors.PassivationInterceptor;
   import org.jboss.seam.interceptors.RemoveInterceptor;
   import org.jboss.seam.interceptors.RollbackInterceptor;
   import org.jboss.seam.interceptors.TransactionInterceptor;
  @@ -94,7 +94,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.162 $
  + * @version $Revision: 1.163 $
    */
   @Scope(ScopeType.APPLICATION)
   public class Component
  @@ -438,7 +438,7 @@
               }
               if ( method.isAnnotationPresent(PostActivate.class) )
               {
  -               prePassivateMethod = method;
  +               postActivateMethod = method;
               }
               if ( method.isAnnotationPresent(PostConstruct.class) )
               {
  @@ -676,11 +676,10 @@
         {
            addInterceptor( new Interceptor( new TransactionInterceptor(), this ) );
         }
  -      /*else
  +      if ( getType()!=ComponentType.STATELESS_SESSION_BEAN )
         {
  -         addInterceptor( new Interceptor( new EJBExceptionInterceptor(), this ) );
  -      }*/
  -      addInterceptor( new Interceptor( new PassivationInterceptor(), this ) );
  +         addInterceptor( new Interceptor( new ManagedEntityIdentityInterceptor(), this ) );
  +      }
      }
   
      public Class<?> getBeanClass()
  @@ -782,12 +781,12 @@
   
      public boolean hasPrePassivateMethod()
      {
  -      return preDestroyMethod!=null;
  +      return prePassivateMethod!=null;
      }
   
      public boolean hasPostActivateMethod()
      {
  -      return postConstructMethod!=null;
  +      return postActivateMethod!=null;
      }
   
      public boolean hasDestroyMethod()