Repository: wicket Updated Branches: refs/heads/wicket-6.x 381391bc2 -> 6bbd60f6e
WICKET-6219 Improve the check for <wicket:fragment> tag so that it works also when a custom namespace is used, like <w:fragment> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6bbd60f6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6bbd60f6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6bbd60f6 Branch: refs/heads/wicket-6.x Commit: 6bbd60f6e9e9425cf5bb6de1741a7e24f6231f8f Parents: 381391b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Aug 19 08:21:50 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Aug 19 08:21:50 2016 +0200 ---------------------------------------------------------------------- .../apache/wicket/markup/html/TransparentWebMarkupContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6bbd60f6/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java index 547fcda..8b07eb6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java @@ -21,6 +21,7 @@ import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupElement; import org.apache.wicket.markup.MarkupStream; +import org.apache.wicket.markup.WicketTag; import org.apache.wicket.markup.html.internal.HtmlHeaderContainer; import org.apache.wicket.markup.resolver.ComponentResolvers; import org.apache.wicket.markup.resolver.IComponentResolver; @@ -54,7 +55,7 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements @Override public Component resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag) { - if ("wicket".equals(tag.getNamespace()) && "fragment".equals(tag.getName())) + if (tag instanceof WicketTag && ((WicketTag)tag).isFragementTag()) { // even having a wicket:id it isn't a component's markup return null;
