[richfaces-svn-commits] JBoss Rich Faces SVN: r9085 - trunk/framework/impl/src/main/java/org/ajax4jsf/component.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2008-06-17 19:16:38 -0400 (Tue, 17 Jun 2008)
New Revision: 9085

Modified:
   trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
Log:
Fix reset data model behavior

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-17 19:25:51 UTC (rev 9084)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java	2008-06-17 23:16:38 UTC (rev 9085)
@@ -444,7 +444,6 @@
 	 */
 	public void encodeAjaxChild(FacesContext context, String path,
 			final Set<String> ids, final Set<String> renderedAreas) throws IOException {
-		resetDataModel();
 
 		Renderer renderer = getRenderer(context);
 		if (null != renderer && renderer instanceof AjaxChildrenRenderer) {
@@ -591,7 +590,7 @@
 	 * decode phase and before component encoding.
 	 */
 	protected void resetDataModel() {
-		this.setExtendedDataModel(null);
+		this._currentModel = null;
 		_modelsMap.clear();
 	}
 
@@ -1650,8 +1649,9 @@
 	public void beforeRenderResponse(PhaseEvent event) {
 		FacesContext context = event.getFacesContext();
 		resetDataModel();
+		this._encoded = null;
 		if (null != childState && !keepSaved(context)) {
-			childState.remove(getBaseClientId(context));
+			childState.clear();
 		}
 	}
 }