Repository: struts Updated Branches: refs/heads/develop ecab1b2b8 -> 7e477b956
WW-4350 Solves problem with race condition Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7e477b95 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7e477b95 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7e477b95 Branch: refs/heads/develop Commit: 7e477b956bd8d57597b649014a20d0d69fae1ce0 Parents: ecab1b2 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Jul 11 08:58:20 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Jul 11 08:58:20 2014 +0200 ---------------------------------------------------------------------- .../opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/7e477b95/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java index 58942fd..27352b9 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java @@ -28,6 +28,7 @@ import ognl.*; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import static java.lang.String.format; import static org.apache.commons.lang3.BooleanUtils.toBoolean; @@ -57,7 +58,7 @@ public class CompoundRootAccessor implements PropertyAccessor, MethodAccessor, C private final static Logger LOG = LoggerFactory.getLogger(CompoundRootAccessor.class); private final static Class[] EMPTY_CLASS_ARRAY = new Class[0]; - private static Map<MethodCall, Boolean> invalidMethods = new HashMap<MethodCall, Boolean>(); + private static Map<MethodCall, Boolean> invalidMethods = new ConcurrentHashMap<MethodCall, Boolean>(); static boolean devMode = false;
