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

Properties values get properly converted to generic Map types (fixing 4.x regression without use of ConversionService)

Browse Source 
Issue: SPR-13256
This commit is contained in:
Juergen Hoeller
2015-08-31 17:20:05 +02:00
parent acc8c895bf
commit d4a23b81e9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,7 +521,6 @@ class TypeConverterDelegate {
}
boolean originalAllowed = requiredType.isInstance(original);
typeDescriptor = typeDescriptor.narrow(original);
TypeDescriptor elementType = typeDescriptor.getElementTypeDescriptor();
if (elementType == null && originalAllowed &&
!this.propertyEditorRegistry.hasCustomEditorForElement(null, propertyName)) {
@@ -603,7 +602,6 @@ class TypeConverterDelegate {
}
boolean originalAllowed = requiredType.isInstance(original);
typeDescriptor = typeDescriptor.narrow(original);
TypeDescriptor keyType = typeDescriptor.getMapKeyTypeDescriptor();
TypeDescriptor valueType = typeDescriptor.getMapValueTypeDescriptor();
if (keyType == null && valueType == null && originalAllowed &&