From f60ba513f0cde1b1ce1dbfd72192f01e875d40db Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Wed, 12 Nov 2008 15:21:48 +0000
Subject: [PATCH] validate after binding

---
 .../webflow/mvc/view/AbstractMvcView.java       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
index 1e114b41..c4778ab0 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
@@ -181,16 +181,15 @@ public abstract class AbstractMvcView implements View {
 		TransitionDefinition transition = requestContext.getMatchingTransition(eventId);
 		if (shouldBind(model, transition)) {
 			mappingResults = bind(model);
-			if (hasMappingErrors(mappingResults)) {
+			if (hasErrors(mappingResults)) {
 				viewErrors = true;
 				addErrorMessages(mappingResults);
-			} else {
-				if (shouldValidate(model, transition)) {
-					validate(model);
-					if (requestContext.getMessageContext().hasErrorMessages()) {
-						viewErrors = true;
-					}
-				}
+			}
+		}
+		if (shouldValidate(model, transition)) {
+			validate(model);
+			if (requestContext.getMessageContext().hasErrorMessages()) {
+				viewErrors = true;
 			}
 		}
 	}
@@ -375,7 +374,7 @@ public abstract class AbstractMvcView implements View {
 		mapper.addMapping(mapping);
 	}
 
-	private boolean hasMappingErrors(MappingResults results) {
+	private boolean hasErrors(MappingResults results) {
 		return results.hasErrorResults() && !onlyPropertyNotFoundErrorsPresent(results);
 	}