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/74b89551 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/74b89551 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/74b89551 Branch: refs/heads/lambdas Commit: 74b895514ab803dba03d9d49399f5ac6fcac7601 Parents: 14cba19 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:54 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/74b89551/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 3b1bf8d..e04341b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -519,25 +519,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()
