From c72144fe8ad9f277237ebb4a9139b654af62a64e Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sun, 23 Mar 2008 04:57:06 +0000
Subject: [PATCH] type conversion error fix

---
 .../java/org/springframework/webflow/mvc/view/MvcView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
index 9a36d86d..90ba357e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
@@ -32,6 +32,7 @@ import org.springframework.binding.expression.ExpressionParser;
 import org.springframework.binding.expression.support.ParserContextImpl;
 import org.springframework.binding.format.Formatter;
 import org.springframework.binding.format.FormatterRegistry;
+import org.springframework.binding.format.InvalidFormatException;
 import org.springframework.binding.mapping.MappingResult;
 import org.springframework.binding.mapping.MappingResults;
 import org.springframework.binding.mapping.MappingResultsCriteria;
@@ -271,7 +272,11 @@ class MvcView implements View {
 			}
 			Formatter formatter = getFormatter(target, targetClass);
 			if (formatter != null) {
-				return formatter.parseValue(formattedValue);
+				try {
+					return formatter.parseValue(formattedValue);
+				} catch (InvalidFormatException e) {
+					throw new ConversionException(String.class, targetClass, e);
+				}
 			} else {
 				return formattedValue;
 			}