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

Merge pull request #94 from dsyer/SPR-9498

Browse Source 
SPR-9498: relax logic detecting successful property editor after conversion exception
This commit is contained in:
jhoeller
2012-09-04 08:54:01 -07:00
parent 50df4d08c2 cd6f7de408
commit db4cc9562f
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/CollectionFactory.java
View File

@@ -35,6 +35,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
import org.springframework.util.LinkedCaseInsensitiveMap;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
/**
* Factory for collections, being aware of Java 5 and Java 6 collections.
@@ -305,6 +307,9 @@ public abstract class CollectionFactory {
else if (SortedMap.class.equals(mapType) || mapType.equals(navigableMapClass)) {
return new TreeMap();
}
else if (MultiValueMap.class.equals(mapType)) {
return new LinkedMultiValueMap();
}
else {
throw new IllegalArgumentException("Unsupported Map interface: " + mapType.getName());
}