From 5011a797774824a23d87d2da8bf1a3dc3a276865 Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Sun, 15 Oct 2023 13:49:24 +1100 Subject: [PATCH] WW-5355 Prevent AtomicInteger being initialised to zero --- .../java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java | 4 ++-- .../main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java index 43b24bb18..b76984a6b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java +++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java @@ -30,10 +30,10 @@ import java.util.concurrent.atomic.AtomicInteger; public class OgnlDefaultCache implements OgnlCache { private final ConcurrentHashMap ognlCache; - private final AtomicInteger cacheEvictionLimit = new AtomicInteger(); + private final AtomicInteger cacheEvictionLimit; public OgnlDefaultCache(int evictionLimit, int initialCapacity, float loadFactor) { - cacheEvictionLimit.set(evictionLimit); + cacheEvictionLimit = new AtomicInteger(evictionLimit); ognlCache = new ConcurrentHashMap<>(initialCapacity, loadFactor); } diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java index 81286af34..4df196388 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java +++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java @@ -36,10 +36,10 @@ import java.util.concurrent.atomic.AtomicInteger; public class OgnlLRUCache implements OgnlCache { private final Map ognlLRUCache; - private final AtomicInteger cacheEvictionLimit = new AtomicInteger(); + private final AtomicInteger cacheEvictionLimit; public OgnlLRUCache(int evictionLimit, int initialCapacity, float loadFactor) { - cacheEvictionLimit.set(evictionLimit); + cacheEvictionLimit = new AtomicInteger(evictionLimit); // Access-order mode selected (order mode true in LinkedHashMap constructor). ognlLRUCache = Collections.synchronizedMap (new LinkedHashMap(initialCapacity, loadFactor, true) { @Override