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

3
spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
View File

@@ -44,6 +44,7 @@ import org.springframework.util.StringUtils;
*
* @author Juergen Hoeller
* @author Rob Harrop
* @author Dave Syer
* @since 2.0
* @see BeanWrapperImpl
* @see SimpleTypeConverter
@@ -244,7 +245,7 @@ class TypeConverterDelegate {
}
if (firstAttemptEx != null) {
if (editor == null && convertedValue == newValue) {
if (editor == null && convertedValue == newValue && requiredType!=null && !ClassUtils.isAssignableValue(requiredType, convertedValue)) {
throw firstAttemptEx;
}
logger.debug("Original ConversionService attempt failed - ignored since " +