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

skip collection conversion early if empty

Browse Source
This commit is contained in:
Juergen Hoeller
2010-06-23 19:32:29 +00:00
parent 8f8fc97b79
commit e6b708376d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,7 +460,7 @@ class TypeConverterDelegate {
Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
boolean originalAllowed = requiredType.isInstance(original);
if (!originalAllowed && !Collection.class.isAssignableFrom(requiredType)) {
if (!originalAllowed && !Collection.class.isAssignableFrom(requiredType) || original.isEmpty()) {
return original;
}
@@ -542,7 +542,7 @@ class TypeConverterDelegate {
Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
boolean originalAllowed = requiredType.isInstance(original);
if (!originalAllowed && !Map.class.isAssignableFrom(requiredType)) {
if (!originalAllowed && !Map.class.isAssignableFrom(requiredType) || original.isEmpty()) {
return original;
}