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

SWF-1229 Prevent wrapping with ObjectToCollection converter where not necessary.

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-04-09 15:28:24 +00:00
parent 13755f4bbe
commit c4fab9bae5
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-binding/src/main/java/org/springframework/binding/convert/service/GenericConversionService.java
View File

@@ -312,7 +312,11 @@ public class GenericConversionService implements ConversionService {
} else {
elementConverter = new StaticConversionExecutor(sourceClass, converter.getTargetClass(), converter);
}
return new StaticConversionExecutor(sourceClass, targetClass, new ObjectToCollection(elementConverter));
if (!Collection.class.isAssignableFrom(converter.getTargetClass())) {
elementConverter = new StaticConversionExecutor(sourceClass, targetClass, new ObjectToCollection(
elementConverter));
}
return elementConverter;
}
}
if (converter.getSourceClass().isAssignableFrom(sourceClass)) {