Repository: wicket Updated Branches: refs/heads/master c2e12216f -> da98a830c
WICKET-3335 fix remaining test Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da98a830 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da98a830 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da98a830 Branch: refs/heads/master Commit: da98a830ce75b94bd7885a759659d1bd7abcf193 Parents: c2e1221 Author: Igor Vaynberg <[email protected]> Authored: Tue Feb 25 14:54:50 2014 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Tue Feb 25 14:54:52 2014 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/MarkupContainer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/da98a830/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 914112a..d588112 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -939,11 +939,18 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp cursor = cursor.getParent(); } + // if we have a path to page dequeue any children if (page != null) { + // if we are already dequeueing there is no need to dequeue again if (!queueRegion.getRequestFlag(RFLAG_CONTAINER_DEQUEING)) { - queueRegion.dequeue(); + // do not dequeue auto components since they are added + // during render phase + if (!child.isAuto()) + { + queueRegion.dequeue(); + } } }
