Browse Source

Merge branch '6.2.x'

pull/34896/head
Sam Brannen 8 months ago
parent
commit
af461fc0a6
  1. 2
      spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

2
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored

@ -441,7 +441,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
return cacheHit; return cacheHit;
} }
@SuppressWarnings("unchecked") @SuppressWarnings({ "unchecked", "rawtypes" })
private @Nullable Object executeSynchronized(CacheOperationInvoker invoker, Method method, CacheOperationContexts contexts) { private @Nullable Object executeSynchronized(CacheOperationInvoker invoker, Method method, CacheOperationContexts contexts) {
CacheOperationContext context = contexts.get(CacheableOperation.class).iterator().next(); CacheOperationContext context = contexts.get(CacheableOperation.class).iterator().next();
if (isConditionPassing(context, CacheOperationExpressionEvaluator.NO_RESULT)) { if (isConditionPassing(context, CacheOperationExpressionEvaluator.NO_RESULT)) {

Loading…
Cancel
Save