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

fixed nested element conversion with a DataBinder + ConversionService + PropertyEditor (SPR-8674)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-12-01 18:49:53 +00:00
parent c9607fdaf2
commit 94513c1a28
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,7 +529,7 @@ class TypeConverterDelegate {
methodParam.increaseNestingLevel();
}
Object convertedElement = convertIfNecessary(
indexedPropertyName, null, element, elementType, typeDescriptor);
indexedPropertyName, null, element, elementType, typeDescriptor.getElementTypeDescriptor());
if (methodParam != null) {
methodParam.decreaseNestingLevel();
}
@@ -623,11 +623,13 @@ class TypeConverterDelegate {
methodParam.increaseNestingLevel();
methodParam.setTypeIndexForCurrentLevel(0);
}
Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType, typeDescriptor);
Object convertedKey = convertIfNecessary(keyedPropertyName, null, key, keyType,
typeDescriptor.getMapKeyTypeDescriptor());
if (methodParam != null) {
methodParam.setTypeIndexForCurrentLevel(1);
}
Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType, typeDescriptor);
Object convertedValue = convertIfNecessary(keyedPropertyName, null, value, valueType,
typeDescriptor.getMapValueTypeDescriptor());
if (methodParam != null) {
methodParam.decreaseNestingLevel();
}