Updated Branches: refs/heads/wicket-1.5.x d4ba2690a -> cffe52d52
WICKET-4687 ConcurrentModificationException with IFeedback instances that contain other IFeedback instances Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cffe52d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cffe52d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cffe52d5 Branch: refs/heads/wicket-1.5.x Commit: cffe52d52c98105e46e461e6bc02dfb4bca00a45 Parents: d4ba269 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 2 15:04:28 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Aug 2 15:06:13 2012 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 4 +++- .../validation/FormComponentFeedbackBorder.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cffe52d5/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index ce3335e..f784cdb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -2239,7 +2239,9 @@ public abstract class Component List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST); if (feedbacks != null) { - for (Component feedback : feedbacks) + // iterate over a copy because a IFeedback may add more IFeedback children (WICKET-4687) + Component[] feedbacksCopy = feedbacks.toArray(new Component[feedbacks.size()]); + for (Component feedback : feedbacksCopy) { feedback.internalBeforeRender(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/cffe52d5/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java index dfc4e3f..3359464 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/FormComponentFeedbackBorder.java @@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.border.Border; * asterisk. * <p> * <strong>Note: </strong> Since this border checks its children do not use - * setTransparentResolver(true) and add the children directly into the border + * TransparentWebMarkupContainer and add the children directly into the border * * @author Jonathan Locke * @author Eelco Hillenius
