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/03/29 15:03:06 UTC
svn commit: r1306829 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
Author: lu4242
Date: Thu Mar 29 13:03:06 2012
New Revision: 1306829
URL: http://svn.apache.org/viewvc?rev=1306829&view=rev
Log:
MYFACES-3514 cc:insertChildren must relocate user tag handlers other tags that contains markup too
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java?rev=1306829&r1=1306828&r2=1306829&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java Thu Mar 29 13:03:06 2012
@@ -226,7 +226,7 @@ public class CompositeComponentResourceT
else if (insertChildrenUsed)
{
if (!(handler instanceof javax.faces.view.facelets.ComponentHandler ||
- nextHandler instanceof ComponentContainerHandler ||
+ handler instanceof ComponentContainerHandler ||
handler instanceof TextHandler))
{
handler.apply(ctx, c);