From d331c5d1c99a2cb6d6932c98b96433e6f9c62c79 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 22 Dec 2011 16:30:22 +0100 Subject: [PATCH 1/2] correctly handle ParseException from Formatter for String->String case (SPR-8944) --- .../java/org/springframework/beans/TypeConverterDelegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/org.springframework.beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java index b34ddbb77e..9776b460b7 100644 --- 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,7 +244,7 @@ class TypeConverterDelegate { } if (firstAttemptEx != null) { - if (editor == null) { + if (editor == null && convertedValue == newValue) { throw firstAttemptEx; } logger.debug("Original ConversionService attempt failed - ignored since " + From af384481818bc27bcfd354193c79e9215f984591 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 23 Dec 2011 09:30:04 +0100 Subject: [PATCH 2/2] Ignore spring-build 'docbook' directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b195d58b62..35570bc600 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ org.springframework.spring-parent/.classpath org.springframework.spring-parent/.project org.springframework.test/test-output/ target +spring-build/lib/docbook