root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polish

This commit is contained in:
Keith Donald 2009-04-09 14:09:10 +00:00
parent a0cab10ccc
commit 3e4810f670
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.core/src/main/java/org/springframework/core/convert/service/CollectionToArray.java
View File

@ -57,7 +57,7 @@ class CollectionToArray extends AbstractCollectionConverter {
private ConversionExecutor getElementConverter(Collection<?> source) { private ConversionExecutor getElementConverter(Collection<?> source) {
ConversionExecutor elementConverter = getElementConverter(); ConversionExecutor elementConverter = getElementConverter();
if (elementConverter == NoOpConversionExecutor.INSTANCE && !source.isEmpty()) { if (elementConverter == NoOpConversionExecutor.INSTANCE) {
Iterator<?> it = source.iterator(); Iterator<?> it = source.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Object value = it.next(); Object value = it.next();

2
org.springframework.core/src/main/java/org/springframework/core/convert/service/CollectionToCollection.java
View File

@ -49,7 +49,7 @@ class CollectionToCollection extends AbstractCollectionConverter {
private ConversionExecutor getElementConverter(Collection<?> source) { private ConversionExecutor getElementConverter(Collection<?> source) {
ConversionExecutor elementConverter = getElementConverter(); ConversionExecutor elementConverter = getElementConverter();
if (elementConverter == NoOpConversionExecutor.INSTANCE && !source.isEmpty() && getTargetElementType() != null) { if (elementConverter == NoOpConversionExecutor.INSTANCE && getTargetElementType() != null) {
Iterator<?> it = source.iterator(); Iterator<?> it = source.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Object value = it.next(); Object value = it.next();

10
org.springframework.core/src/test/java/org/springframework/core/convert/service/CollectionToCollectionTests.java
View File

@ -1,6 +1,7 @@
package org.springframework.core.convert.service; package org.springframework.core.convert.service;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -70,6 +71,15 @@ public class CollectionToCollectionTests {
assertEquals(null, result.get(3)); assertEquals(null, result.get(3));
assertEquals(new Integer(3), result.get(4)); assertEquals(new Integer(3), result.get(4));
} }
@Test
public void testCollectionToCollectionConversionNoGenericInfoSourceEmpty() throws Exception {
DefaultConversionService service = new DefaultConversionService();
CollectionToCollection c = new CollectionToCollection(TypeDescriptor.valueOf(Collection.class),
new TypeDescriptor(getClass().getField("integerTarget")), service);
List result = (List) c.execute(bindTarget);
assertTrue(result.isEmpty());
}
public Collection<String> bindTarget = new ArrayList<String>(); public Collection<String> bindTarget = new ArrayList<String>();