WW-5355 Fix interface and unit test bug

SimaSaasDemo · Oct 15, 2023 · 7463e1d · 7463e1d
1 parent 4700dca
commit 7463e1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java
@@ -35,14 +35,10 @@ default OgnlCache<Key, Value> buildOgnlCache(int evictionLimit,
                                                  int initialCapacity,
                                                  float loadFactor,
                                                  boolean lruCache) {
-        if (lruCache) {
-            return buildOgnlCache(evictionLimit, initialCapacity, loadFactor, CacheType.SYNC_LINKED_LRU);
-        } else {
-            return buildOgnlCache(evictionLimit,
-                    initialCapacity,
-                    loadFactor,
-                    lruCache ? CacheType.SYNC_LINKED_LRU : getDefaultCacheType());
-        }
+        return buildOgnlCache(evictionLimit,
+                initialCapacity,
+                loadFactor,
+                lruCache ? CacheType.SYNC_LINKED_LRU : getDefaultCacheType());
     }
 
     /**

diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -1870,7 +1870,7 @@ public void testOgnlDefaultCacheFactoryCoverage() {
         ognlCache = defaultOgnlCacheFactory.buildOgnlCache();
         assertNotNull("No param build method result null ?", ognlCache);
         assertEquals("Eviction limit for cache mismatches limit for factory ?", 30, ognlCache.getEvictionLimit());
-        ognlCache = defaultOgnlCacheFactory.buildOgnlCache(15, 15, 0.75f, false);
+        ognlCache = defaultOgnlCacheFactory.buildOgnlCache(15, 15, 0.75f, true);
         assertNotNull("No param build method result null ?", ognlCache);
         assertEquals("Eviction limit for cache mismatches limit for factory ?", 15, ognlCache.getEvictionLimit());
     }