Repository: struts Updated Branches: refs/heads/support-2-3 f29585248 -> 1158b0add
fix for WW-4573 NPE/ concurrent modification exception using a CopyOnWriteArrayList. This is to keep Memory consistency on the ValueStack. Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1158b0ad Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1158b0ad Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1158b0ad Branch: refs/heads/support-2-3 Commit: 1158b0adda67eaf9ab021b8b6d0376d4f13e81ba Parents: f295852 Author: Victor Sosa <victorns...@gmail.com> Authored: Sat Jan 2 15:18:37 2016 -0400 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Jan 4 20:07:04 2016 +0100 ---------------------------------------------------------------------- .../main/java/com/opensymphony/xwork2/util/CompoundRoot.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/1158b0ad/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java index 9abade0..e548a00 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java @@ -17,6 +17,7 @@ package com.opensymphony.xwork2.util; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; /** @@ -25,12 +26,14 @@ import java.util.List; * @author plightbo * @version $Revision$ */ -public class CompoundRoot extends ArrayList { +public class CompoundRoot extends CopyOnWriteArrayList<Object> { + + private static final long serialVersionUID = 8563229069192473995L; public CompoundRoot() { } - public CompoundRoot(List list) { + public CompoundRoot(List<?> list) { super(list); }
