You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/06/02 05:00:23 UTC
svn commit: r1130387 -
/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
Author: lu4242
Date: Thu Jun 2 03:00:23 2011
New Revision: 1130387
URL: http://svn.apache.org/viewvc?rev=1130387&view=rev
Log:
MYFACES-3165 UIData.broadcast does not push composite component on EL stack
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=1130387&r1=1130386&r2=1130387&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Thu Jun 2 03:00:23 2011
@@ -1314,8 +1314,13 @@ public class UIData extends UIComponentB
int eventRowIndex = ((FacesEventWrapper) event).getRowIndex();
final int currentRowIndex = getRowIndex();
UIComponent source = originalEvent.getComponent();
-
+ UIComponent compositeParent = UIComponent.getCompositeComponentParent(source);
+
setRowIndex(eventRowIndex);
+ if (compositeParent != null)
+ {
+ pushComponentToEL(getFacesContext(), compositeParent);
+ }
pushComponentToEL(getFacesContext(), source);
try
{
@@ -1324,6 +1329,10 @@ public class UIData extends UIComponentB
finally
{
popComponentFromEL(getFacesContext());
+ if (compositeParent != null)
+ {
+ popComponentFromEL(getFacesContext());
+ }
setRowIndex(currentRowIndex);
}
}