add double check for synchronization for caching with sync=true

aerospike · Jun 18, 2024 · 0753898 · 0753898
1 parent 180c353
commit 0753898
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/org/springframework/data/aerospike/cache/AerospikeCache.java b/src/main/java/org/springframework/data/aerospike/cache/AerospikeCache.java
@@ -115,15 +115,17 @@ public Object getNativeCache() {
     @SuppressWarnings({"NullableProblems"})
     public <T> T get(Object key, Callable<T> valueLoader) {
         Key dbKey = getKey(key);
-        Record record;
-        synchronized (this) {
-            record = client.get(null, dbKey);
-            if (record == null) {
-                T value = callValueLoader(valueLoader, key);
-                if (Objects.nonNull(value)) {
-                    put(key, value);
+        Record record = client.get(null, dbKey);
+        if (record == null && valueLoader != null) {
+            synchronized (this) {
+                record = client.get(null, dbKey);
+                if (record == null) {
+                    T value = callValueLoader(valueLoader, key);
+                    if (Objects.nonNull(value)) {
+                        put(key, value);
+                    }
+                    return value;
                 }
-                return value;
             }
         }
         if (record.getValue(VALUE) != null) {