Author: nbelaevski Date: 2008-10-24 13:59:09 -0400 (Fri, 24 Oct 2008) New Revision: 10903 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java Log: https://jira.jboss.org/jira/browse/RF-4713 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-10-24 15:55:55 UTC (rev 10902) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-10-24 17:59:09 UTC (rev 10903) @@ -39,7 +39,6 @@ import javax.faces.FacesException; import javax.faces.FactoryFinder; import javax.faces.application.StateManager; -import javax.faces.application.StateManager.SerializedView; import javax.faces.component.UIComponentBase; import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; @@ -455,6 +454,11 @@ String id = restoreLogicalViewId(context, viewId, renderKitId); StateHolder stateHolder = getStateHolder(context); Object[] restoredState = stateHolder.getState(viewId, id); + + if (restoredState != null && id != null) { + context.getExternalContext().getRequestMap().put(AJAX_VIEW_SEQUENCE, id); + } + return restoredState; } @@ -569,9 +573,6 @@ String id = (String) getRenderKit(context, renderKitId) .getResponseStateManager().getTreeStructureToRestore(context, viewId); - if (null != id) { - context.getExternalContext().getRequestMap().put(AJAX_VIEW_SEQUENCE, id); - } return id; }