From 1158b0adda67eaf9ab021b8b6d0376d4f13e81ba Mon Sep 17 00:00:00 2001
From: Victor Sosa <victornsosa@gmail.com>
Date: Sat, 2 Jan 2016 15:18:37 -0400
Subject: [PATCH] fix for WW-4573

NPE/ concurrent modification exception

using a CopyOnWriteArrayList. This is to keep Memory consistency on the
ValueStack.
---
 .../java/com/opensymphony/xwork2/util/CompoundRoot.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 9abade066..e548a0046 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);
     }