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

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Simon Baslé
2024-09-30 10:19:36 +02:00
parent d79258ac73 e32a2f339d
commit 854f6ffd39
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1155,7 +1155,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
.onErrorResume(RuntimeException.class, ex -> {
try {
getErrorHandler().handleCacheGetError((RuntimeException) ex, cache, key);
return evaluate(null, invoker, method, contexts);
Object e = evaluate(null, invoker, method, contexts);
return (e != null ? e : Flux.error((RuntimeException) ex));
}
catch (RuntimeException exception) {
return Flux.error(exception);
@@ -1169,7 +1170,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
.onErrorResume(RuntimeException.class, ex -> {
try {
getErrorHandler().handleCacheGetError((RuntimeException) ex, cache, key);
return evaluate(null, invoker, method, contexts);
Object e = evaluate(null, invoker, method, contexts);
return (e != null ? e : Mono.error((RuntimeException) ex));
}
catch (RuntimeException exception) {
return Mono.error(exception);