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

fixed collection element conversion using ConversionService (SPR-6950)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-03-25 11:53:41 +00:00
parent f836601e0f
commit d50881d82b
3 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,8 +572,7 @@ class TypeConverterDelegate {
if (methodParam != null) {
methodParam.increaseNestingLevel();
}
Object convertedElement =
convertIfNecessary(indexedPropertyName, null, element, elementType, typeDescriptor);
Object convertedElement = convertIfNecessary(indexedPropertyName, null, element, elementType);
if (methodParam != null) {
methodParam.decreaseNestingLevel();
}
@@ -652,11 +651,11 @@ class TypeConverterDelegate {
methodParam.increaseNestingLevel();
methodParam.setTypeIndexForCurrentLevel(0);
}
Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType, typeDescriptor);
Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType);
if (methodParam != null) {
methodParam.setTypeIndexForCurrentLevel(1);
}
Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType, typeDescriptor);
Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType);
if (methodParam != null) {
methodParam.decreaseNestingLevel();
}