myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1130388 - /myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java
Date Thu, 02 Jun 2011 03:00:36 GMT
Author: lu4242
Date: Thu Jun  2 03:00:36 2011
New Revision: 1130388

URL: http://svn.apache.org/viewvc?rev=1130388&view=rev
Log:
MYFACES-3165 UIData.broadcast does not push composite component on EL stack

Modified:
    myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java

Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java?rev=1130388&r1=1130387&r2=1130388&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/component/UIData.java Thu Jun
 2 03:00:36 2011
@@ -768,8 +768,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
             {
@@ -778,6 +783,10 @@ public class UIData extends UIComponentB
             finally
             {
                 popComponentFromEL(getFacesContext());
+                if (compositeParent != null)
+                {
+                    popComponentFromEL(getFacesContext());
+                }
                 setRowIndex(currentRowIndex);
             }
         }



Mime
View raw message