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

[Gavin King]

  User: gavin   
  Date: 07/01/23 17:06:18

  Modified:    src/main/org/jboss/seam/contexts  Lifecycle.java
  Log:
  JBSEAM-686
  
  Revision  Changes    Path
  1.78      +5 -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.77
  retrieving revision 1.78
  diff -u -b -r1.77 -r1.78
  --- Lifecycle.java	23 Jan 2007 18:59:38 -0000	1.77
  +++ Lifecycle.java	23 Jan 2007 22:06:18 -0000	1.78
  @@ -30,7 +30,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.77 $
  + * @version $Revision: 1.78 $
    */
   public class Lifecycle
   {
  @@ -396,8 +396,11 @@
               log.debug("destroying conversation context");
               Contexts.destroy( Contexts.getConversationContext() );
            }
  -         if ( !Seam.isSessionInvalid() && !Init.instance().isClientSideConversations() )
  +         if ( !Init.instance().isClientSideConversations() )
            {
  +            //note that we need to flush even if the session is
  +            //about to be invalidated, since we still need
  +            //to destroy the conversation context in endSession()
               log.debug("flushing server-side conversation context");
               Contexts.getConversationContext().flush();
            }