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

Avoid unnecessary compilation attempts in SpEL's Indexer 

Closes gh-32677
This commit is contained in:
Sam Brannen 2024-04-19 17:04:41 +02:00
parent 1eed71bb1d
commit 80fb8ea813
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
View File

@ -355,8 +355,11 @@ public class Indexer extends SpelNodeImpl {
@Override @Override
public boolean isCompilable() { public boolean isCompilable() {
if (this.exitTypeDescriptor == null) {
return false;
}
if (this.indexedType == IndexedType.ARRAY) { if (this.indexedType == IndexedType.ARRAY) {
return (this.exitTypeDescriptor != null && this.arrayTypeDescriptor != null); return (this.arrayTypeDescriptor != null);
} }
SpelNodeImpl index = this.children[0]; SpelNodeImpl index = this.children[0];
if (this.indexedType == IndexedType.LIST) { if (this.indexedType == IndexedType.LIST) {
@ -792,10 +795,11 @@ public class Indexer extends SpelNodeImpl {
this.evaluationContext, this.targetObject, this.name); this.evaluationContext, this.targetObject, this.name);
} }
updatePropertyReadState(accessor, this.name, targetType); updatePropertyReadState(accessor, this.name, targetType);
TypedValue result = accessor.read(this.evaluationContext, this.targetObject, this.name);
if (accessor instanceof CompilablePropertyAccessor compilablePropertyAccessor) { if (accessor instanceof CompilablePropertyAccessor compilablePropertyAccessor) {
setExitTypeDescriptor(CodeFlow.toDescriptor(compilablePropertyAccessor.getPropertyType())); setExitTypeDescriptor(CodeFlow.toDescriptor(compilablePropertyAccessor.getPropertyType()));
} }
return accessor.read(this.evaluationContext, this.targetObject, this.name); return result;
} }
} }
} }