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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/pageflow  Page.java
  Log:
    JBSEAM-688
  
  Revision  Changes    Path
  1.10      +16 -2     jboss-seam/src/main/org/jboss/seam/pageflow/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pageflow/Page.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Page.java	17 Dec 2006 15:32:04 -0000	1.9
  +++ Page.java	23 Jan 2007 23:42:32 -0000	1.10
  @@ -2,8 +2,8 @@
   
   import org.dom4j.Element;
   import org.jboss.seam.core.BusinessProcess;
  +import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.Interpolator;
  -import org.jboss.seam.core.Manager;
   import org.jbpm.graph.def.Node;
   import org.jbpm.graph.exe.ExecutionContext;
   import org.jbpm.jpdl.xml.JpdlXmlReader;
  @@ -24,6 +24,7 @@
      
      private String viewId;
      private boolean isConversationEnd = false;
  +   private boolean isConversationEndBeforeRedirect = false;
      private boolean isTaskEnd = false;
      private String transition;
      private String processToCreate;
  @@ -52,6 +53,7 @@
         if ( endConversationElement!=null )
         {
            isConversationEnd = true;
  +         isConversationEndBeforeRedirect = "true".equals( endConversationElement.attributeValue("before-redirect") );
            processToCreate = endConversationElement.attributeValue("create-process");
         }
         Element endTaskElement = pageElement.element("end-task");
  @@ -95,7 +97,14 @@
   
         if (isConversationEnd || isTaskEnd ) 
         {
  -         Manager.instance().endConversation(false);
  +         if (isConversationEndBeforeRedirect)
  +         {
  +            Conversation.instance().endBeforeRedirect();
  +         }
  +         else
  +         {
  +            Conversation.instance().end();
  +         }
         }
      }
   
  @@ -156,4 +165,9 @@
      {
         return processToCreate;
      }
  +
  +   public boolean isConversationEndBeforeRedirect()
  +   {
  +      return isConversationEndBeforeRedirect;
  +   }
   }