Merge branch '5.3.x'

vikeychen · Feb 28, 2022 · 27ee9cd · 27ee9cd
2 parents c979559 + 84de100
commit 27ee9cd
Show file tree

Hide file tree

Showing 5 changed files with 1,271 additions and 1,258 deletions.
diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import org.springframework.lang.Nullable;
 
 /**
- * A method resolver attempts locate a method and returns a command executor that can be
- * used to invoke that method. The command executor will be cached but if it 'goes stale'
+ * A method resolver attempts to locate a method and returns a command executor that can be
+ * used to invoke that method. The command executor will be cached, but if it 'goes stale'
  * the resolvers will be called again.
  *
  * @author Andy Clement

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -200,8 +200,7 @@ private MethodExecutor findAccessorForMethod(List<TypeDescriptor> argumentTypes,
 			EvaluationContext evaluationContext) throws SpelEvaluationException {
 
 		AccessException accessException = null;
-		List<MethodResolver> methodResolvers = evaluationContext.getMethodResolvers();
-		for (MethodResolver methodResolver : methodResolvers) {
+		for (MethodResolver methodResolver : evaluationContext.getMethodResolvers()) {
 			try {
 				MethodExecutor methodExecutor = methodResolver.resolve(
 						evaluationContext, targetObject, this.name, argumentTypes);