Repository: wicket Updated Branches: refs/heads/wicket-7.x 2cb9bc0cc -> 7b42dd04c
WICKET-6021 ConcurrentModificationException in MarkupContainer#iterator#next No need to use #copyChildren() explicitly. It is used internally by #iterator() now Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7b42dd04 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7b42dd04 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7b42dd04 Branch: refs/heads/wicket-7.x Commit: 7b42dd04c91950b4e4e9654153e14e8ec7caf820 Parents: 2cb9bc0 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 3 22:08:42 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 3 22:08:42 2015 +0100 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7b42dd04/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 4de0d9f..b8e64db 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -1532,12 +1532,10 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp { super.onBeforeRenderChildren(); - // We need to copy the children list because the children components can - // modify the hierarchy in their onBeforeRender. try { // Loop through child components - for (final Component child : copyChildren()) + for (final Component child : this) { // Get next child // Call begin request on the child
