Repository: wicket Updated Branches: refs/heads/wicket-7.x 21d80950b -> 2cb9bc0cc
WICKET-6021 ConcurrentModificationException in MarkupContainer#iterator#next Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2cb9bc0c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2cb9bc0c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2cb9bc0c Branch: refs/heads/wicket-7.x Commit: 2cb9bc0ccf5f45395a3e02ab664f0f1e473c3bc6 Parents: 21d8095 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 3 21:53:14 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 3 21:53:14 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/MarkupContainer.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2cb9bc0c/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 7b42e84..4de0d9f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -520,25 +520,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp return new Iterator<Component>() { Component currentComponent = null; - Iterator<Component> internalIterator; - { - if (children == null) - { - internalIterator = Collections.emptyIterator(); - } - else if (children instanceof Component) - { - internalIterator = Collections.singleton((Component)children).iterator(); - } - else if (children instanceof List) - { - internalIterator = ((List<Component>)children).iterator(); - } - else - { - internalIterator = ((Map<String, Component>)children).values().iterator(); - } - } + Iterator<Component> internalIterator = copyChildren().iterator(); @Override public boolean hasNext()
