[seam-commits] Seam SVN: r14599 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-04-17 10:29:38 -0400 (Tue, 17 Apr 2012)
New Revision: 14599

Modified:
   branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBSEAM-4917 adding conversation init in RESTORE_VIEW

Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java	2012-04-17 14:29:17 UTC (rev 14598)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java	2012-04-17 14:29:38 UTC (rev 14599)
@@ -27,6 +27,7 @@
 import org.jboss.seam.contexts.Context;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.contexts.FacesLifecycle;
+import org.jboss.seam.core.ConversationPropagation;
 import org.jboss.seam.core.Events;
 import org.jboss.seam.core.Init;
 import org.jboss.seam.core.Manager;
@@ -387,7 +388,14 @@
 	   boolean conversationFound = Contexts.isPageContextActive() ? Contexts.getPageContext().isSet("org.jboss.seam.jsf.SeamPhaseListener.conversationFound") : false;
 	   FacesLifecycle.resumePage();
 	   Map parameters = facesContext.getExternalContext().getRequestParameterMap();
+	   if (!conversationFound) // there is exceptional case when restoring of conversation wasn't called while page context was lazily initialized
+	   {
+	      ConversationPropagation.instance().restoreConversationId(parameters);
+	      conversationFound = Manager.instance().restoreConversation();
+	   }
+	   FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
 	   postRestorePage(facesContext, parameters, conversationFound);
+	   
    }
 
    public void raiseEventsBeforePhase(PhaseEvent event)