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

[Gavin King]

  User: gavin   
  Date: 06/09/26 23:53:49

  Modified:    src/main/org/jboss/seam/ejb  SeamInterceptor.java
  Log:
  stateful seam interceptors
  page parameters
  crud framework prototype
  bugfixes to PC passivation stuff
  
  Revision  Changes    Path
  1.45      +7 -2      jboss-seam/src/main/org/jboss/seam/ejb/SeamInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/ejb/SeamInterceptor.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- SeamInterceptor.java	23 Sep 2006 15:41:39 -0000	1.44
  +++ SeamInterceptor.java	27 Sep 2006 03:53:49 -0000	1.45
  @@ -7,6 +7,7 @@
   package org.jboss.seam.ejb;
   
   import java.io.Serializable;
  +import java.util.List;
   
   import javax.annotation.PostConstruct;
   import javax.annotation.PreDestroy;
  @@ -24,6 +25,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.interceptors.EventType;
  +import org.jboss.seam.interceptors.Interceptor;
   import org.jboss.seam.interceptors.SeamInvocationContext;
   
   /**
  @@ -31,7 +33,7 @@
    * for a session bean component
    * 
    * @author Gavin King
  - * @version $Revision: 1.44 $
  + * @version $Revision: 1.45 $
    */
   public class SeamInterceptor implements Serializable
   {
  @@ -42,6 +44,7 @@
      private boolean isSeamComponent;
      private String componentName;
      private transient Component component;
  +   private List<Object> userInterceptors;
      
      /**
       * Called when instatiated by EJB container.
  @@ -63,6 +66,7 @@
      {
         this.type = type;
         this.component = component;
  +      userInterceptors = component.createUserInterceptors(type);
         isSeamComponent = true;
         componentName = component.getName();
      }
  @@ -83,6 +87,7 @@
               isSeamComponent = true;
               componentName = beanClass.getAnnotation(Name.class).value();
               component = Seam.componentForName(componentName);
  +            userInterceptors = component.createUserInterceptors(type);
            }
            else
            {
  @@ -188,7 +193,7 @@
            {
               log.trace("intercepted: " + component.getName() + '.' + invocation.getMethod().getName());
            }
  -         return new SeamInvocationContext( invocation, eventType, component.getInterceptors(type) ).proceed();
  +         return new SeamInvocationContext( invocation, eventType, userInterceptors, component.getInterceptors(type) ).proceed();
         }
         else {
            if ( log.isTraceEnabled() )