correctly handle ParseException from Formatter for String->String case (SPR-8944)

2011-12-22 14:57:23 +01:00
parent 0053319c62
commit 86bef9030f
2 changed files with 27 additions and 1 deletions
--- a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
@@ -244,6 +244,9 @@ class TypeConverterDelegate {
 		}

 		if (firstAttemptEx != null) {
+			if (editor == null) {
+				throw firstAttemptEx;
+			}
 			logger.debug("Original ConversionService attempt failed - ignored since " +
 					"PropertyEditor based conversion eventually succeeded", firstAttemptEx);
 		}