From 16e49bf0c92f9387ccf10426f77ba3b02f4c24fb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Thu, 16 Jan 2020 15:07:14 +0100
Subject: [PATCH] Simplify getCache() implementation in CaffeineCacheManager

Closes gh-24376
---
 .../cache/caffeine/CaffeineCacheManager.java     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java
index 54331f8909d..0d43e94389f 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ import org.springframework.util.ObjectUtils;
  * @author Ben Manes
  * @author Juergen Hoeller
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.3
  * @see CaffeineCache
  */
@@ -178,17 +179,8 @@ public class CaffeineCacheManager implements CacheManager {
 	@Override
 	@Nullable
 	public Cache getCache(String name) {
-		Cache cache = this.cacheMap.get(name);
-		if (cache == null && this.dynamic) {
-			synchronized (this.cacheMap) {
-				cache = this.cacheMap.get(name);
-				if (cache == null) {
-					cache = createCaffeineCache(name);
-					this.cacheMap.put(name, cache);
-				}
-			}
-		}
-		return cache;
+		return this.cacheMap.computeIfAbsent(name, cacheName ->
+				this.dynamic ? createCaffeineCache(cacheName) : null);
 	}
 
 	/**