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

[Gavin King]

  User: gavin   
  Date: 07/06/13 12:43:03

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  good start on JBSEAM-116 (finally)
  
  Revision  Changes    Path
  1.52      +3 -1      jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- AbstractSeamPhaseListener.java	13 Jun 2007 15:21:07 -0000	1.51
  +++ AbstractSeamPhaseListener.java	13 Jun 2007 16:43:03 -0000	1.52
  @@ -16,6 +16,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.ConversationList;
  +import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.ConversationStack;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.FacesMessages;
  @@ -62,7 +63,8 @@
      {
         Lifecycle.resumePage();
         Map parameters = facesContext.getExternalContext().getRequestParameterMap();
  -      boolean conversationFound = Manager.instance().restoreConversation(parameters);
  +      ConversationPropagation.instance().restoreConversationId(parameters);
  +      boolean conversationFound = Manager.instance().restoreConversation();
         Lifecycle.resumeConversation( facesContext.getExternalContext() );
         if (!conversationFound)
         {