Author: manaRH Date: 2012-03-26 10:45:22 -0400 (Mon, 26 Mar 2012) New Revision: 14437 Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java Log: fixed restoring of PageContext after restoreView Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java =================================================================== --- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-03-26 14:45:03 UTC (rev 14436) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-03-26 14:45:22 UTC (rev 14437) @@ -93,7 +93,7 @@ /** * Is PageContext set? * - * If not it is lazily created in case of RESTORE_VIEW is processing + * If not, it is lazily created in case of RESTORE_VIEW is processing * This is a requirement for starting CONVERSATION - JSF2 change * @return */ 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-03-26 14:45:03 UTC (rev 14436) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java 2012-03-26 14:45:22 UTC (rev 14437) @@ -385,6 +385,7 @@ protected void afterRestoreView(FacesContext facesContext) { boolean conversationFound = Contexts.isPageContextActive() ? Contexts.getPageContext().isSet("org.jboss.seam.jsf.SeamPhaseListener.conversationFound") : false; + FacesLifecycle.resumePage(); Map parameters = facesContext.getExternalContext().getRequestParameterMap(); postRestorePage(facesContext, parameters, conversationFound); }