Merge branch '3.1.x'

2011-12-22 15:55:15 +01:00
parent 544a29a91a 3d5e245374
commit 22de6b76f1
3 changed files with 31 additions and 2 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);
 		}