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

[Gavin King]

  User: gavin   
  Date: 07/06/05 20:37:26

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  JBSEAM-1361
  
  Revision  Changes    Path
  1.89      +9 -2      jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -b -r1.88 -r1.89
  --- Lifecycle.java	3 Jun 2007 23:02:25 -0000	1.88
  +++ Lifecycle.java	6 Jun 2007 00:37:26 -0000	1.89
  @@ -29,7 +29,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.88 $
  + * @version $Revision: 1.89 $
    */
   public class Lifecycle
   {
  @@ -40,8 +40,15 @@
      {
         log.debug( ">>> Begin web request" );
         Contexts.eventContext.set( new WebRequestContext( ContextAdaptor.getRequest(externalContext) ) );
  -      Contexts.sessionContext.set( new WebSessionContext( ContextAdaptor.getSession(externalContext) ) );
         Contexts.applicationContext.set( new FacesApplicationContext(externalContext) );
  +      ContextAdaptor session = ContextAdaptor.getSession(externalContext);
  +      Contexts.sessionContext.set( new WebSessionContext(session) );
  +      if ( ServletSession.instance().isInvalidDueToNewScheme() )
  +      {
  +         session.invalidate();
  +         session = ContextAdaptor.getSession(externalContext);
  +         Contexts.sessionContext.set( new WebSessionContext(session) );
  +      }
         Contexts.conversationContext.set(null); //in case endRequest() was never called
         //Events.instance(); //TODO: only for now, until we have a way to do EL outside of JSF!
      }