From 942c656970df903705417b0b9631b2dd66e3bff0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 23 Jun 2010 20:05:00 +0000 Subject: [PATCH] removed eager skipping of empty collection conversion, for UtilNamespaceHandlerTests to pass again --- .../java/org/springframework/beans/TypeConverterDelegate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java index 968a9e9777..dedda9eb1f 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java @@ -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) || original.isEmpty()) { + if (!originalAllowed && !Collection.class.isAssignableFrom(requiredType)) { 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) || original.isEmpty()) { + if (!originalAllowed && !Map.class.isAssignableFrom(requiredType)) { return original; }