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/63b12267
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/63b12267
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/63b12267

Branch: refs/heads/lambdas
Commit: 63b12267117a545ea78fc5db2b75d9abc7d56b8d
Parents: 74b8955
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:10:08 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/63b12267/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 e04341b..3bef2a8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1477,12 +1477,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

Reply via email to