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

[Gavin King]

  User: gavin   
  Date: 07/06/11 12:05:47

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  fix problem with new session creation
  
  Revision  Changes    Path
  1.94      +6 -12     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.93
  retrieving revision 1.94
  diff -u -b -r1.93 -r1.94
  --- Lifecycle.java	10 Jun 2007 19:40:28 -0000	1.93
  +++ Lifecycle.java	11 Jun 2007 16:05:47 -0000	1.94
  @@ -181,14 +181,14 @@
               Component dependentComponent = Component.forName(dependency);
               if (dependentComponent!=null)
               {
  -               startup( dependentComponent );
  +               startup(dependentComponent);
               }
            }
         }
   
         if ( !component.getScope().getContext().isSet( component.getName() ) ) 
         {
  -         log.info("starting up: " + component.getName());
  +         log.info( "starting up: " + component.getName() );
            component.newInstance();
         }
      }
  @@ -219,17 +219,14 @@
         boolean applicationContextActive = Contexts.isApplicationContextActive();
         boolean eventContextActive = Contexts.isEventContextActive();
         boolean conversationContextActive = Contexts.isConversationContextActive();
  -      boolean sessionContextActive = Contexts.isSessionContextActive();
  +
         if ( !applicationContextActive )
         {
            Context tempApplicationContext = new ApplicationContext( new ServletApplicationMap(servletContext) );
            Contexts.applicationContext.set(tempApplicationContext);
         }
  -      if ( !sessionContextActive )
  -      {
  -         Context tempSessionContext = new SessionContext(session);
  -         Contexts.sessionContext.set(tempSessionContext);
  -      }
  +      Context oldSessionContext = Contexts.sessionContext.get();
  +      Contexts.sessionContext.set( new SessionContext(session) ); //we have to use the session object that came in the sessionCreated() event
         Context tempEventContext = null;
         if ( !eventContextActive )
         {
  @@ -255,10 +252,7 @@
            Contexts.destroy(tempEventContext);
            Contexts.eventContext.set(null);
         }
  -      if ( !sessionContextActive )
  -      {
  -         Contexts.sessionContext.set(null);
  -      }
  +       Contexts.sessionContext.set(oldSessionContext); //replace the one from sessionCreated() with the one from JSF, or null
         if ( !applicationContextActive ) 
         {
            Contexts.applicationContext.set(null);