spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-28 18:19:05 +00:00
Code Issues Projects Releases Wiki Activity

spr-7728: empty collection conversion can return value not assignable to targetType

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3883 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Keith Donald
2011-01-07 14:21:54 +00:00
parent 5a7d2a91ba
commit c45f4b1caf
4 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
-3
View File
@@ -62,9 +62,6 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
return null;
}
Collection<?> sourceCollection = (Collection<?>) source;
if (sourceCollection.isEmpty()) {
return sourceCollection;
}
Collection target = CollectionFactory.createCollection(targetType.getType(), sourceCollection.size());
for (Object sourceElement : sourceCollection) {
Object targetElement = this.conversionService.convert(sourceElement, sourceType.getElementTypeDescriptor().applyIndexedObject(sourceElement), targetType.getElementTypeDescriptor());
org.springframework.core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
-3
View File
@@ -67,9 +67,6 @@ final class MapToMapConverter implements ConditionalGenericConverter {
return null;
}
Map<?, ?> sourceMap = (Map<?, ?>) source;
if (sourceMap.isEmpty()) {
return sourceMap;
}
Map targetMap = CollectionFactory.createMap(targetType.getType(), sourceMap.size());
for (Object entry : sourceMap.entrySet()) {
Map.Entry sourceMapEntry = (Map.Entry) entry;