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

[Gavin King]

  User: gavin   
  Date: 07/01/23 18:42:33

  Modified:    src/main/org/jboss/seam/pages  ConversationControl.java
  Log:
    JBSEAM-688
  
  Revision  Changes    Path
  1.2       +19 -1     jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationControl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ConversationControl.java	17 Dec 2006 19:46:41 -0000	1.1
  +++ ConversationControl.java	23 Jan 2007 23:42:32 -0000	1.2
  @@ -12,6 +12,7 @@
   
      private boolean isBeginConversation;
      private boolean isEndConversation;
  +   private boolean isEndConversationBeforeRedirect;
      private boolean join;
      private boolean nested;
      private FlushModeType flushMode;
  @@ -41,8 +42,15 @@
      {
         if ( isEndConversation )
         {
  +         if (isEndConversationBeforeRedirect)
  +         {
  +            Conversation.instance().endBeforeRedirect();
  +         }
  +         else
  +         {
            Conversation.instance().end();
         }
  +      }
         if ( isBeginConversation )
         {
            boolean begun = Conversation.instance().begin(join, nested);
  @@ -100,4 +108,14 @@
         this.pageflow = pageflow;
      }
      
  +   public boolean isEndConversationBeforeRedirect()
  +   {
  +      return isEndConversationBeforeRedirect;
  +   }
  +
  +   public void setEndConversationBeforeRedirect(boolean isEndConversationBeforeRedirect)
  +   {
  +      this.isEndConversationBeforeRedirect = isEndConversationBeforeRedirect;
  +   }
  +   
   }
  \ No newline at end of file