Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test coverage

Browse Source
This commit is contained in:
Andy Clement
2009-05-27 19:37:17 +00:00
parent 1746cc76d1
commit 233c84e0b9
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
View File

@@ -132,12 +132,17 @@ public class Selection extends SpelNodeImpl {
}
return new TypedValue(result,op.getTypeDescriptor());
} else {
if (operand==null && nullSafe) {
return TypedValue.NULL_TYPED_VALUE;
if (operand==null) {
if (nullSafe) {
return TypedValue.NULL_TYPED_VALUE;
} else {
throw new SpelEvaluationException(getStartPosition(), SpelMessages.INVALID_TYPE_FOR_SELECTION,
"null");
}
} else {
throw new SpelEvaluationException(getStartPosition(), SpelMessages.INVALID_TYPE_FOR_SELECTION,
(operand == null ? "null" : operand.getClass().getName()));
}
operand.getClass().getName());
}
}
}