Merge branch '6.1.x'

simonbasle · simonbasle · commit 5e72ee36e278 · 2024-08-12T14:54:54.000+02:00
diff --git 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 @@ private Object findInCaches(CacheOperationContext context, Object key,
 							(value != null ? CompletableFuture.completedFuture(unwrapCacheValue(value)) : null),
 							invoker, method, contexts));
 				}
+				else {
+					continue;
+				}
 			}
 			if (this.reactiveCachingHandler != null) {
 				Object returnValue = this.reactiveCachingHandler.findInCaches(

Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,9 @@ private Object findInCaches(CacheOperationContext context, Object key,`
`524`	`524`	`(value != null ? CompletableFuture.completedFuture(unwrapCacheValue(value)) : null),`
`525`	`525`	`invoker, method, contexts));`
`526`	`526`	`}`
	`527`	`+ else {`
	`528`	`+ continue;`
	`529`	`+ }`
`527`	`530`	`}`
`528`	`531`	`if (this.reactiveCachingHandler != null) {`
`529`	`532`	`Object returnValue = this.reactiveCachingHandler.findInCaches(`