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

typed map and collection conversion routines now eagerly reject non-assignable required types and avoid spurious InvocationException stack traces in debug log (SPR-7058) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3221 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams 2010-04-02 08:00:48 +00:00
parent c340cf02e0
commit 54bf216425
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
View File

@ -520,6 +520,10 @@ class TypeConverterDelegate {
Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
boolean originalAllowed = requiredType.isInstance(original); boolean originalAllowed = requiredType.isInstance(original);
if (!originalAllowed && !Collection.class.isAssignableFrom(requiredType)) {
return original;
}
MethodParameter methodParam = typeDescriptor.getMethodParameter(); MethodParameter methodParam = typeDescriptor.getMethodParameter();
Class elementType = null; Class elementType = null;
if (methodParam != null) { if (methodParam != null) {
@ -594,8 +598,14 @@ class TypeConverterDelegate {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected Map convertToTypedMap(Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) { protected Map convertToTypedMap(
Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
boolean originalAllowed = requiredType.isInstance(original); boolean originalAllowed = requiredType.isInstance(original);
if (!originalAllowed && !Map.class.isAssignableFrom(requiredType)) {
return original;
}
Class keyType = null; Class keyType = null;
Class valueType = null; Class valueType = null;
MethodParameter methodParam = typeDescriptor.getMethodParameter(); MethodParameter methodParam = typeDescriptor.getMethodParameter();