From 1b0c6b848d29c6dd3b2fb92435e87590f0575e46 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 15 Dec 2009 09:59:11 +0000
Subject: [PATCH] only try to convert to String if canConvert returns true

---
 .../validation/AbstractPropertyBindingResult.java          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
index 493863abdd..091fead14e 100644
--- a/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
+++ b/org.springframework.context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
@@ -116,9 +116,10 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
 		}
 		if (this.conversionService != null) {
 			// Try custom formatter...
-			TypeDescriptor td = getPropertyAccessor().getPropertyTypeDescriptor(fixedField);
-			if (td != null) {
-				return this.conversionService.convert(value, td, TypeDescriptor.valueOf(String.class));
+			TypeDescriptor fieldDesc = getPropertyAccessor().getPropertyTypeDescriptor(fixedField);
+			TypeDescriptor stringDesc = TypeDescriptor.valueOf(String.class);
+			if (fieldDesc != null && this.conversionService.canConvert(fieldDesc, stringDesc)) {
+				return this.conversionService.convert(value, fieldDesc, stringDesc);
 			}
 		}
 		return value;