root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Simon Baslé 2024-08-12 14:54:54 +02:00
parent b7ddf1b4f4 f4a73b79b8
commit 5e72ee36e2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored
View File

@ -524,6 +524,9 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
(value != null ? CompletableFuture.completedFuture(unwrapCacheValue(value)) : null), (value != null ? CompletableFuture.completedFuture(unwrapCacheValue(value)) : null),
invoker, method, contexts)); invoker, method, contexts));
} }
else {
continue;
}
} }
if (this.reactiveCachingHandler != null) { if (this.reactiveCachingHandler != null) {
Object returnValue = this.reactiveCachingHandler.findInCaches( Object returnValue = this.reactiveCachingHandler.findInCaches(