🐛 Refactor HashMapLoadingCache.getLoading() to prevent double get() c…

…alls and reduce race conditions
SoftInstigate · May 14, 2024 · 47ef8fb · 47ef8fb
1 parent ff90f08
commit 47ef8fb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/commons/src/main/java/org/restheart/cache/impl/HashMapLoadingCache.java b/commons/src/main/java/org/restheart/cache/impl/HashMapLoadingCache.java
@@ -53,8 +53,10 @@ public Optional<V> remove(K key) {
 
     @Override
     public Optional<V> getLoading(K key) {
-        if(get(key) != null) {
-            return get(key);
+        var cachedValue = get(key);
+
+        if(cachedValue != null) {
+            return cachedValue;
         } else {
             var value = Optional.ofNullable(loader.apply(key));