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

[Gavin King]

  User: gavin   
  Date: 07/06/08 15:22:47

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  oops
  
  Revision  Changes    Path
  1.90      +3 -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.89
  retrieving revision 1.90
  diff -u -b -r1.89 -r1.90
  --- Lifecycle.java	6 Jun 2007 00:37:26 -0000	1.89
  +++ Lifecycle.java	8 Jun 2007 19:22:47 -0000	1.90
  @@ -29,7 +29,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.89 $
  + * @version $Revision: 1.90 $
    */
   public class Lifecycle
   {
  @@ -43,7 +43,8 @@
         Contexts.applicationContext.set( new FacesApplicationContext(externalContext) );
         ContextAdaptor session = ContextAdaptor.getSession(externalContext);
         Contexts.sessionContext.set( new WebSessionContext(session) );
  -      if ( ServletSession.instance().isInvalidDueToNewScheme() )
  +      ServletSession servletSession = ServletSession.instance();
  +      if ( servletSession!=null /*yuck! unit tests!*/ && servletSession.isInvalidDueToNewScheme() )
         {
            session.invalidate();
            session = ContextAdaptor.getSession(externalContext);