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

polishing

This commit is contained in:
Juergen Hoeller 2010-10-10 20:11:53 +00:00
parent 5be9473136
commit 1cd77e2a15
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
View File

@ -160,7 +160,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
TypedValue contextObject = state.getActiveContextObject(); TypedValue contextObject = state.getActiveContextObject();
Object targetObject = contextObject.getValue(); Object targetObject = contextObject.getValue();
if (targetObject == null && nullSafe) { if (targetObject == null && this.nullSafe) {
return TypedValue.NULL; return TypedValue.NULL;
} }
@ -188,7 +188,8 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
for (PropertyAccessor accessor : accessorsToTry) { for (PropertyAccessor accessor : accessorsToTry) {
if (accessor.canRead(eContext, contextObject.getValue(), name)) { if (accessor.canRead(eContext, contextObject.getValue(), name)) {
if (accessor instanceof ReflectivePropertyAccessor) { if (accessor instanceof ReflectivePropertyAccessor) {
accessor = ((ReflectivePropertyAccessor)accessor).createOptimalAccessor(eContext, contextObject.getValue(), name); accessor = ((ReflectivePropertyAccessor) accessor).createOptimalAccessor(
eContext, contextObject.getValue(), name);
} }
this.cachedReadAccessor = accessor; this.cachedReadAccessor = accessor;
return accessor.read(eContext, contextObject.getValue(), name); return accessor.read(eContext, contextObject.getValue(), name);
@ -203,7 +204,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
throw new SpelEvaluationException(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL, name); throw new SpelEvaluationException(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL, name);
} }
else { else {
throw new SpelEvaluationException(getStartPosition(),SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE, name, throw new SpelEvaluationException(getStartPosition(), SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE, name,
FormatHelper.formatClassNameForMessage(contextObjectClass)); FormatHelper.formatClassNameForMessage(contextObjectClass));
} }
} }