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

[Gavin King]

  User: gavin   
  Date: 07/06/10 16:18:17

  Modified:    src/main/org/jboss/seam/core  FacesPage.java
  Log:
  fix bug in logic
  
  Revision  Changes    Path
  1.10      +4 -4      jboss-seam/src/main/org/jboss/seam/core/FacesPage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesPage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesPage.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- FacesPage.java	10 Jun 2007 19:25:58 -0000	1.9
  +++ FacesPage.java	10 Jun 2007 20:18:17 -0000	1.10
  @@ -117,12 +117,12 @@
         //RENDER_RESPONSE phase, ie. not before redirects
      
         ServletSession servletSession = ServletSession.getInstance();
  -      boolean sessionValid = servletSession!=null && !servletSession.isInvalid();
  -      if ( sessionValid && manager.isLongRunningConversation() )
  +      boolean sessionInvalid = servletSession!=null && servletSession.isInvalid();
  +      if ( !sessionInvalid && manager.isLongRunningConversation() )
         {
            storeConversation( manager.getCurrentConversationId() );
         }
  -      else if ( sessionValid && manager.isNestedConversation() )
  +      else if ( !sessionInvalid && manager.isNestedConversation() )
         {
            discardNestedConversation( manager.getParentConversationId() );
         }
  @@ -131,7 +131,7 @@
            discardTemporaryConversation();
         }
   
  -      if ( sessionValid && Init.instance().isClientSideConversations()  )
  +      if ( !sessionInvalid && Init.instance().isClientSideConversations()  )
         {
            // if we are using client-side conversations, put the
            // map containing the conversation context variables