spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 13:31:46 +00:00
Code Issues Projects Releases Wiki Activity

skip collection conversion early if empty

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3449 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller
2010-06-23 19:32:29 +00:00
parent 568f84f25e
commit afffa21643
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
+2 -2
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;
}