root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

PropertyOrFieldReference avoids NPE through defensive copy of volatile accessor reference 

Issue: SPR-13023
This commit is contained in:
Juergen Hoeller 2015-05-13 15:45:48 +02:00
parent 0711d6d0df
commit 9799df397a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -80,8 +80,9 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
public TypedValue getValueInternal(ExpressionState state) throws EvaluationException { public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
TypedValue tv = getValueInternal(state.getActiveContextObject(), state.getEvaluationContext(), TypedValue tv = getValueInternal(state.getActiveContextObject(), state.getEvaluationContext(),
state.getConfiguration().isAutoGrowNullReferences()); state.getConfiguration().isAutoGrowNullReferences());
if (this.cachedReadAccessor instanceof CompilablePropertyAccessor) { PropertyAccessor accessorToUse = this.cachedReadAccessor;
CompilablePropertyAccessor accessor = (CompilablePropertyAccessor) this.cachedReadAccessor; if (accessorToUse instanceof CompilablePropertyAccessor) {
CompilablePropertyAccessor accessor = (CompilablePropertyAccessor) accessorToUse;
this.exitTypeDescriptor = CodeFlow.toDescriptor(accessor.getPropertyType()); this.exitTypeDescriptor = CodeFlow.toDescriptor(accessor.getPropertyType());
} }
return tv; return tv;
@ -338,13 +339,18 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
@Override @Override
public boolean isCompilable() { public boolean isCompilable() {
return (this.cachedReadAccessor instanceof CompilablePropertyAccessor && PropertyAccessor accessorToUse = this.cachedReadAccessor;
((CompilablePropertyAccessor) this.cachedReadAccessor).isCompilable()); return (accessorToUse instanceof CompilablePropertyAccessor &&
((CompilablePropertyAccessor) accessorToUse).isCompilable());
} }
@Override @Override
public void generateCode(MethodVisitor mv, CodeFlow cf) { public void generateCode(MethodVisitor mv, CodeFlow cf) {
((CompilablePropertyAccessor) this.cachedReadAccessor).generateCode(this.name, mv, cf); PropertyAccessor accessorToUse = this.cachedReadAccessor;
if (!(accessorToUse instanceof CompilablePropertyAccessor)) {
throw new IllegalStateException("Property accessor is not compilable: " + accessorToUse);
}
((CompilablePropertyAccessor) accessorToUse).generateCode(this.name, mv, cf);
cf.pushDescriptor(this.exitTypeDescriptor); cf.pushDescriptor(this.exitTypeDescriptor);
} }