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

[Norman Richards]

  User: nrichards
  Date: 07/12/08 02:35:27

  Modified:    src/main/org/jboss/seam/intercept  RootInterceptor.java
  Log:
  JBSEAM-2207
  
  Revision  Changes    Path
  1.16      +6 -4      jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RootInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- RootInterceptor.java	21 Jun 2007 08:12:55 -0000	1.15
  +++ RootInterceptor.java	8 Dec 2007 07:35:27 -0000	1.16
  @@ -95,14 +95,15 @@
      
      protected Object invoke(InvocationContext invocation, EventType invocationType) throws Exception
      {
  -      if ( !isSeamComponent )
  +      if ( !isSeamComponent || !Lifecycle.isApplicationInitialized())
         {
            //not a Seam component
            return invocation.proceed();
         }
         else if ( Contexts.isEventContextActive() || Contexts.isApplicationContextActive() ) //not sure about the second bit (only needed at init time!)
         {
  -         //a Seam component, and Seam contexts exist
  +
  +         // a Seam component, and Seam contexts exist
            return createInvocationContext(invocation, invocationType).proceed();
         }
         else
  @@ -110,6 +111,7 @@
            //if invoked outside of a set of Seam contexts,
            //set up temporary Seam EVENT and APPLICATION
            //contexts just for this call
  +         
            Lifecycle.beginCall();
            try
            {