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/10/18 21:45:29 UTC
svn commit: r1399818 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
Author: lu4242
Date: Thu Oct 18 19:45:28 2012
New Revision: 1399818
URL: http://svn.apache.org/viewvc?rev=1399818&view=rev
Log:
MYFACES-3630 PartialViewContextImpl.findHeadComponent and findBodyComponent does not take into account h:head or h:body inside child of UIViewRoot
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=1399818&r1=1399817&r2=1399818&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Thu Oct 18 19:45:28 2012
@@ -668,9 +668,9 @@ public class PartialViewContextImpl exte
{
for (UIComponent grandchild : child.getChildren())
{
- if (child instanceof HtmlHead)
+ if (grandchild instanceof HtmlHead)
{
- return child;
+ return grandchild;
}
}
}
@@ -690,9 +690,9 @@ public class PartialViewContextImpl exte
{
for (UIComponent grandchild : child.getChildren())
{
- if (child instanceof HtmlBody)
+ if (grandchild instanceof HtmlBody)
{
- return child;
+ return grandchild;
}
}
}