myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1657958 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
Date Fri, 06 Feb 2015 20:48:28 GMT
Author: lu4242
Date: Fri Feb  6 20:48:27 2015
New Revision: 1657958

URL: http://svn.apache.org/r1657958
Log:
MYFACES-3951 Action not performed on first click

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java?rev=1657958&r1=1657957&r2=1657958&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InterfaceHandler.java
Fri Feb  6 20:48:27 2015
@@ -200,8 +200,9 @@ public class InterfaceHandler extends Ta
         // in other words we are calling ViewDeclarationLanguage.getComponentMetadata
         if ( ((AbstractFaceletContext)ctx).isBuildingCompositeComponentMetadata() )
         {
+            FaceletCompositionContext fcc = FaceletCompositionContext.getCurrentInstance(ctx);
             UIComponent compositeBaseParent
-                    = FaceletCompositionContext.getCurrentInstance(ctx).getCompositeComponentFromStack();
+                    = fcc.getCompositeComponentFromStack();
             
             CompositeComponentBeanInfo beanInfo = 
                 (CompositeComponentBeanInfo) compositeBaseParent.getAttributes()
@@ -244,7 +245,16 @@ public class InterfaceHandler extends Ta
             CompositeTagAttributeUtils.addUnspecifiedAttributes(descriptor, tag, 
                     STANDARD_ATTRIBUTES_SORTED, ctx);
             
-            nextHandler.apply(ctx, parent);
+            try
+            {
+                fcc.startComponentUniqueIdSection("__ccmd_");
+                
+                nextHandler.apply(ctx, parent);
+            }
+            finally
+            {
+                fcc.endComponentUniqueIdSection("__ccmd_");
+            }
         }
     }
     



Mime
View raw message