SAK-44641 MBM containsKey producing wrong results upon expiration (sa…

…kaiproject#8797)
chundcm · Nov 9, 2020 · b07140d · b07140d
1 parent 360fa61
commit b07140d
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/...pl/src/main/java/org/sakaiproject/messagebundle/impl/CachingMessageBundleServiceImpl.java b/...pl/src/main/java/org/sakaiproject/messagebundle/impl/CachingMessageBundleServiceImpl.java
@@ -62,28 +62,17 @@ public void destroy() {
 
     @Override
     public Map<String, String> getBundle(String baseName, String moduleName, Locale locale) {
-        Map<String, String> bundle = null;
         String key = MessageBundleServiceImpl.getIndexKeyName(baseName, moduleName, locale != null ? locale.toString(): null);
         log.debug("Retrieve bundle from cache with key = {}", key);
 
-        if (cache.containsKey(key)) {
-            log.debug("Cache contains the key = {}", key);
-            bundle = cache.get(key);
-        } else {
-            // bundle not in cache or expired
+        Map<String, String> bundle = cache.get(key);
+        if (bundle == null) {
+            // bundle not in cache or expired, never returns null
             bundle = dbMessageBundleService.getBundle(baseName, moduleName, locale);
             log.debug("Add bundle to cache with key = {}", key);
             cache.put(key, bundle);
         }
 
-        // ensure we always return a valid collection
-        if (bundle == null) {
-            log.debug("Null bundle found with key = {}", key);
-            bundle = Collections.emptyMap();
-            // cache the empty for negative lookups this prevents repeated db lookups for this key
-            cache.put(key, bundle);
-        }
-
         return bundle;
     }