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 2015/07/03 18:22:35 UTC
wicket git commit: WICKET-5942 TestCase failure after cfa36fbea621
Repository: wicket
Updated Branches:
refs/heads/master f53a4ef20 -> 50e9fb1b1
WICKET-5942 TestCase failure after cfa36fbea621
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/50e9fb1b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/50e9fb1b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/50e9fb1b
Branch: refs/heads/master
Commit: 50e9fb1b104a8f18e99a3fbecd7bd73fc72741bd
Parents: f53a4ef
Author: Andrea Del Bene <“adelbene@apache.org”>
Authored: Fri Jul 3 18:21:33 2015 +0200
Committer: Andrea Del Bene <“adelbene@apache.org”>
Committed: Fri Jul 3 18:22:17 2015 +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/50e9fb1b/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 a53415d..ef406c2 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
@@ -49,7 +49,8 @@ public class TransparentWebMarkupContainer extends WebMarkupContainer implements
public Component resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
{
Component resolvedComponent = getParent().get(tag.getId());
- if (resolvedComponent != null && getPage().wasRendered(resolvedComponent))
+ if (resolvedComponent != null &&
+ (getPage().wasRendered(resolvedComponent) || resolvedComponent.isAuto()))
{
/*
* Means that parent container has an associated homonymous tag to this grandchildren