Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better synchronization in ConcurrentMapCache

Browse Source 
Issue: SPR-13810
This commit is contained in:
Stephane Nicoll
2016-07-05 16:44:07 +02:00
parent 9b9f3714ae
commit 3096888c7d
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java vendored
View File

@@ -59,7 +59,7 @@ public class ConcurrentMapCache extends AbstractValueAdaptingCache {
* @param name the name of the cache
*/
public ConcurrentMapCache(String name) {
this(name, new ConcurrentHashMap<Object, Object>(256), true);
this(name, new ConcurrentHashMap<>(256), true);
}
/**
@@ -69,7 +69,7 @@ public class ConcurrentMapCache extends AbstractValueAdaptingCache {
* values for this cache
*/
public ConcurrentMapCache(String name, boolean allowNullValues) {
this(name, new ConcurrentHashMap<Object, Object>(256), allowNullValues);
this(name, new ConcurrentHashMap<>(256), allowNullValues);
}
/**
@@ -141,20 +141,14 @@ public class ConcurrentMapCache extends AbstractValueAdaptingCache {
return (T) get(key).get();
}
else {
synchronized (this.store) {
if (this.store.containsKey(key)) {
return (T) get(key).get();
}
T value;
return (T) fromStoreValue(this.store.computeIfAbsent(key, r -> {
try {
value = valueLoader.call();
return toStoreValue(valueLoader.call());
}
catch (Exception ex) {
throw new ValueRetrievalException(key, valueLoader, ex);
}
put(key, value);
return value;
}
}));
}
}