Author: konstantin.mishin Date: 2008-06-12 11:53:36 -0400 (Thu, 12 Jun 2008) New Revision: 9021 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java trunk/framework/impl/src/main/resources/META-INF/faces-config.xml Log: RF-2815 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-06-12 15:18:37 UTC (rev 9020) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxViewHandler.java 2008-06-12 15:53:36 UTC (rev 9021) @@ -40,6 +40,7 @@ import org.ajax4jsf.resource.InternetResourceBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.event.ComponentViewPhaseListener; /** * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $) @@ -90,6 +91,7 @@ ajaxContext.setAjaxRequest(false); } } + riRoot.addPhaseListener(new ComponentViewPhaseListener()); return riRoot; } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-06-12 15:18:37 UTC (rev 9020) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-06-12 15:53:36 UTC (rev 9021) @@ -593,6 +593,7 @@ */ protected void resetDataModel() { this.setExtendedDataModel(null); + _modelsMap.clear(); } /** @@ -1214,9 +1215,6 @@ } public void encodeBegin(FacesContext context) throws IOException { - if (null != childState && !keepSaved(context)) { - childState.remove(getBaseClientId(context)); - } // Mark component as used, if parent UIData change own range states not // accessed at // encode phase must be unsaved. @@ -1651,6 +1649,10 @@ } public void beforePhase(PhaseEvent event) { + FacesContext context = event.getFacesContext(); resetDataModel(); + if (null != childState && !keepSaved(context)) { + childState.remove(getBaseClientId(context)); + } } } Modified: trunk/framework/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2008-06-12 15:18:37 UTC (rev 9020) +++ trunk/framework/impl/src/main/resources/META-INF/faces-config.xml 2008-06-12 15:53:36 UTC (rev 9021) @@ -18,7 +18,6 @@ <lifecycle> <phase-listener>org.ajax4jsf.event.AjaxPhaseListener</phase-listener> <phase-listener>org.ajax4jsf.event.InitPhaseListener</phase-listener> - <phase-listener>org.richfaces.event.ComponentViewPhaseListener</phase-listener> </lifecycle> <managed-bean> <managed-bean-name>a4j</managed-bean-name>