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

updated for change in conversion service api; source type desc now required 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1935 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Keith Donald 2009-09-18 20:32:41 +00:00
parent b0a5462cb3
commit aa9794526d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,16 +166,17 @@ class TypeConverterDelegate {
// No custom editor but custom ConversionService specified?
ConversionService conversionService = this.propertyEditorRegistry.getConversionService();
if (editor == null && conversionService != null && convertedValue != null) {
TypeDescriptor typeDesc;
TypeDescriptor sourceTypeDesc = TypeDescriptor.valueOf(convertedValue.getClass());
TypeDescriptor targetTypeDesc;
if (methodParam != null) {
typeDesc = (descriptor != null ?
targetTypeDesc = (descriptor != null ?
new BeanTypeDescriptor(methodParam, descriptor) : new TypeDescriptor(methodParam));
}
else {
typeDesc = TypeDescriptor.valueOf(requiredType);
targetTypeDesc = TypeDescriptor.valueOf(requiredType);
}
if (conversionService.matches(convertedValue.getClass(), typeDesc)) {
return (T) conversionService.convert(convertedValue, typeDesc);
if (conversionService.canConvert(sourceTypeDesc, targetTypeDesc)) {
return (T) conversionService.convert(convertedValue, sourceTypeDesc, targetTypeDesc);
}
}