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

introspect element type in case of incoming Collection/Map in order to not accidentally say canConvert=true (SPR-6564)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-12-15 12:36:22 +00:00
parent 5f9f69958e
commit 2153b2fbd5
8 changed files with 209 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,7 +194,7 @@ class TypeConverterDelegate {
// No custom editor but custom ConversionService specified?
ConversionService conversionService = this.propertyEditorRegistry.getConversionService();
if (editor == null && conversionService != null && convertedValue != null) {
TypeDescriptor sourceTypeDesc = TypeDescriptor.valueOf(convertedValue.getClass());
TypeDescriptor sourceTypeDesc = new TypeDescriptor(convertedValue);
if (conversionService.canConvert(sourceTypeDesc, typeDescriptor)) {
return (T) conversionService.convert(convertedValue, sourceTypeDesc, typeDescriptor);
}