Repository: struts Updated Branches: refs/heads/master ed20ccd3f -> b4f8d0391
WW-4769 Uses emptySet instead of manually creating Sets Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b4f8d039 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4f8d039 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4f8d039 Branch: refs/heads/master Commit: b4f8d03910681807da2c8a23c714d6567eea0e52 Parents: ed20ccd Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Apr 4 08:28:04 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Apr 4 08:28:04 2017 +0200 ---------------------------------------------------------------------- core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/b4f8d039/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java index 74da771..fe64d8f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java +++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java @@ -49,6 +49,7 @@ import java.util.regex.Pattern; public class OgnlUtil { private static final Logger LOG = LogManager.getLogger(OgnlUtil.class); + private ConcurrentMap<String, Object> expressions = new ConcurrentHashMap<>(); private final ConcurrentMap<Class, BeanInfo> beanInfoCache = new ConcurrentHashMap<>(); private TypeConverter defaultConverter; @@ -57,9 +58,9 @@ public class OgnlUtil { private boolean enableExpressionCache = true; private boolean enableEvalExpression; - private Set<Class<?>> excludedClasses = new HashSet<>(); - private Set<Pattern> excludedPackageNamePatterns = new HashSet<>(); - private Set<String> excludedPackageNames = new HashSet<>(); + private Set<Class<?>> excludedClasses = Collections.emptySet(); + private Set<Pattern> excludedPackageNamePatterns = Collections.emptySet(); + private Set<String> excludedPackageNames = Collections.emptySet(); private Container container; private boolean allowStaticMethodAccess;
