You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/11/13 12:53:11 UTC
wicket git commit: WICKET-5748 StackOverflowError while trying to get
the Markup of WicketHeadContainer
Repository: wicket
Updated Branches:
refs/heads/master 6b2a65b0f -> 82fbbad78
WICKET-5748 StackOverflowError while trying to get the Markup of
WicketHeadContainer
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/82fbbad7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/82fbbad7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/82fbbad7
Branch: refs/heads/master
Commit: 82fbbad78973b900d84def5eebebb4986c412401
Parents: 6b2a65b
Author: Andrea Del Bene <ad...@apache.org>
Authored: Thu Nov 13 12:51:59 2014 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Thu Nov 13 12:51:59 2014 +0100
----------------------------------------------------------------------
.../apache/wicket/markup/html/internal/HtmlHeaderContainer.java | 5 +++--
.../org/apache/wicket/markup/resolver/HtmlHeaderResolver.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/82fbbad7/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
index 17e9c5e..1ce6809 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
@@ -32,6 +32,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.PageHeaderItem;
import org.apache.wicket.markup.head.internal.HeaderResponse;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.renderStrategy.AbstractHeaderRenderStrategy;
import org.apache.wicket.request.Response;
import org.apache.wicket.response.StringResponse;
@@ -48,7 +49,7 @@ import org.apache.wicket.response.StringResponse;
* <head> regions may contain additional wicket components, which can be added by means of
* add(Component) as usual.
* <p>
- * <wicket:head> tags are handled by simple {@link TransparentWebMarkupContainer}s also created by
+ * <wicket:head> tags are handled by simple {@link WebMarkupContainer}s also created by
* {@link org.apache.wicket.markup.resolver.HtmlHeaderResolver}.
* <p>
* <ul>
@@ -371,7 +372,7 @@ public class HtmlHeaderContainer extends TransparentWebMarkupContainer
// Find the markup fragment
MarkupStream stream = new MarkupStream(markup);
IMarkupFragment headerMarkup = null;
- while (stream.skipUntil(ComponentTag.class) && (headerMarkup == null))
+ while (stream.skipUntil(ComponentTag.class))
{
ComponentTag tag = stream.getTag();
if (tag.isOpen() || tag.isOpenClose())
http://git-wip-us.apache.org/repos/asf/wicket/blob/82fbbad7/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
index f5ab571..a915a75 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
@@ -171,7 +171,7 @@ public class HtmlHeaderResolver implements IComponentResolver
/**
* A component for <wicket:head> elements
*/
- private static class WicketHeadContainer extends TransparentWebMarkupContainer
+ private static class WicketHeadContainer extends WebMarkupContainer
{
/**
* Constructor.