Merge branch '6.1.x'

2 years ago · 5e72ee36e2
1 changed files with 3 additions and 0 deletions
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
@ -524,6 +524,9 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
				@@ -524,6 +524,9 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 							(value != null ? CompletableFuture.completedFuture(unwrapCacheValue(value)) : null),
 							invoker, method, contexts));
 				}
+				else {
+					continue;
+				}
 			}
 			if (this.reactiveCachingHandler != null) {
 				Object returnValue = this.reactiveCachingHandler.findInCaches(