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 2012/08/03 15:30:58 UTC

svn commit: r1368943 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java

Author: lu4242
Date: Fri Aug  3 13:30:58 2012
New Revision: 1368943

URL: http://svn.apache.org/viewvc?rev=1368943&view=rev
Log:
MYFACES-3589 Allow multiple resolutions of cc into the same EL expression 

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java?rev=1368943&r1=1368942&r2=1368943&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java Fri Aug  3 13:30:58 2012
@@ -417,7 +417,6 @@ public final class CompositeComponentELU
     {
         UIComponent cc = ccLevel > 0 ? getCompositeComponentBasedOnLocation(facesContext, location, ccLevel)
                 : getCompositeComponentBasedOnLocation(facesContext, location);
-        //facesContext.getAttributes().put(CURRENT_COMPOSITE_COMPONENT_KEY, cc);
         List<UIComponent> list = (List<UIComponent>) facesContext.getAttributes().get(CURRENT_COMPOSITE_COMPONENT_KEY);
         if (list == null)
         {
@@ -433,7 +432,6 @@ public final class CompositeComponentELU
      */
     public static void removeCompositeComponentForResolver(FacesContext facesContext)
     {
-        facesContext.getAttributes().remove(CURRENT_COMPOSITE_COMPONENT_KEY);
         List<UIComponent> list = (List<UIComponent>) facesContext.getAttributes().get(CURRENT_COMPOSITE_COMPONENT_KEY);
         if (list != null)
         {