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

[Gavin King]

  User: gavin   
  Date: 07/06/03 13:52:15

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  JBSEAM-1390
  
  Revision  Changes    Path
  1.87      +9 -5      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.86
  retrieving revision 1.87
  diff -u -b -r1.86 -r1.87
  --- Lifecycle.java	24 Apr 2007 09:30:00 -0000	1.86
  +++ Lifecycle.java	3 Jun 2007 17:52:15 -0000	1.87
  @@ -16,20 +16,20 @@
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.core.BusinessProcess;
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Mutable;
  +import org.jboss.seam.core.Session;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.86 $
  + * @version $Revision: 1.87 $
    */
   public class Lifecycle
   {
  @@ -309,9 +309,11 @@
         log.debug("After render response, destroying contexts");
         try
         {
  +         boolean sessionInvalid = Session.instance().isInvalid();
  +         
            flushAndDestroyContexts();
   
  -         if ( Seam.isSessionInvalid() )
  +         if (sessionInvalid)
            {
               clearThreadlocals();
               Lifecycle.setPhaseId(null);
  @@ -351,9 +353,11 @@
   
         try
         {
  +         boolean sessionInvalid = Session.instance().isInvalid();
  +         
            flushAndDestroyContexts();
   
  -         if ( Seam.isSessionInvalid() )
  +         if (sessionInvalid)
            {
               clearThreadlocals();
               ContextAdaptor.getSession(session).invalidate(); //huh? we create a session just to invalidate it?
  @@ -530,7 +534,7 @@
         try
         {
            Contexts.destroy(conversationContext);
  -         if ( !Seam.isSessionInvalid() ) //its also unnecessary during a session timeout
  +         if ( !Session.instance().isInvalid() ) //its also unnecessary during a session timeout
            {
               conversationContext.clear();
               conversationContext.flush();