You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2018/05/08 12:48:06 UTC

[myfaces] 03/28: merge revisions 1368943-1368953

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch 2.1.x-client-window
in repository https://gitbox.apache.org/repos/asf/myfaces.git

commit bdc0c392384b6ac00a04fddfbbdf615ca532a933
Author: Leonardo Uribe <lu...@apache.org>
AuthorDate: Fri Aug 3 14:42:50 2012 +0000

    merge revisions 1368943-1368953
---
 .../org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
index 96f1581..fd55e88 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
@@ -417,7 +417,6 @@ public final class CompositeComponentELUtils
     {
         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 CompositeComponentELUtils
      */
     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)
         {

-- 
To stop receiving notification emails like this one, please contact
deki@apache.org.