liangqi
/
spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed eager skipping of empty collection conversion, for UtilNamespaceHandlerTests to pass again

Browse Source
master
Juergen Hoeller 14 years ago
parent 7faf4a6713
commit 942c656970
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java

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

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

Write Preview
Loading…
Cancel
Save