Skip to content

Commit 20a1261

Browse files
committed
Make rootObject parameter consistently nullable
MethodBasedEvaluationContext and CacheEvaluationContext should allow a nullable rootObject constructor parameter like StandardEvaluationContext does. Closes gh-35206
1 parent 4fdf40e commit 20a1261

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvaluationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CacheEvaluationContext extends MethodBasedEvaluationContext {
4848
private final Set<String> unavailableVariables = new HashSet<>(1);
4949

5050

51-
CacheEvaluationContext(Object rootObject, Method method, @Nullable Object[] arguments,
51+
CacheEvaluationContext(@Nullable Object rootObject, Method method, @Nullable Object[] arguments,
5252
ParameterNameDiscoverer parameterNameDiscoverer) {
5353

5454
super(rootObject, method, arguments, parameterNameDiscoverer);

spring-context/src/main/java/org/springframework/context/expression/MethodBasedEvaluationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class MethodBasedEvaluationContext extends StandardEvaluationContext {
5353
private boolean argumentsLoaded = false;
5454

5555

56-
public MethodBasedEvaluationContext(Object rootObject, Method method, @Nullable Object[] arguments,
56+
public MethodBasedEvaluationContext(@Nullable Object rootObject, Method method, @Nullable Object[] arguments,
5757
ParameterNameDiscoverer parameterNameDiscoverer) {
5858

5959
super(rootObject);

0 commit comments

Comments
 (0)