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

Author: alexsmirnov Date: 2008-04-23 20:14:18 -0400 (Wed, 23 Apr 2008) New Revision: 8104 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java Log: Fix http://jira.jboss.com/jira/browse/RF-2297 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-04-24 00:10:21 UTC (rev 8103) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-04-24 00:14:18 UTC (rev 8104) @@ -1294,6 +1294,15 @@ */ public void queueEvent(FacesEvent event) { if (event.getComponent() != this) { + // For Ajax events, keep row value. + if (event.getPhaseId() == PhaseId.RENDER_RESPONSE) { + Object eventRowKey = getRowKey(); + if (null != eventRowKey) { + this._ajaxRowKey = eventRowKey; + this._ajaxRowKeysMap.put(getBaseClientId(getFacesContext()), + eventRowKey); + } + } event = new IndexedEvent(this, event, getRowKey()); } // Send event directly to parent, to avoid wrapping in superclass. @@ -1324,11 +1333,6 @@ setRowKey(faces, eventRowKey); FacesEvent rowEvent = revent.getTarget(); rowEvent.getComponent().broadcast(rowEvent); - // For Ajax events, keep row value. - if (!(rowEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)) { - this._ajaxRowKey = eventRowKey; - // this._ajaxRowKeysMap.put(getBaseClientId(faces), eventRowKey); - } setRowKey(faces, oldRowKey); restoreOrigValue(faces); // }