diff --git a/spring-binding/src/main/java/org/springframework/binding/mapping/results/AbstractMappingResult.java b/spring-binding/src/main/java/org/springframework/binding/mapping/results/AbstractMappingResult.java index 76dc6387..c9114256 100644 --- a/spring-binding/src/main/java/org/springframework/binding/mapping/results/AbstractMappingResult.java +++ b/spring-binding/src/main/java/org/springframework/binding/mapping/results/AbstractMappingResult.java @@ -51,7 +51,8 @@ public abstract class AbstractMappingResult implements MappingResult { public abstract Object getMappedValue(); public String toString() { - ToStringCreator creator = new ToStringCreator(this).append("code", getCode()).append("error", isError()); + ToStringCreator creator = new ToStringCreator(this).append("mapping", mapping).append("code", getCode()) + .append("error", isError()); if (isError()) { creator.append("errorCause", getErrorCause()); } diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp index 96b80098..4b3803d5 100644 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp +++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp @@ -81,13 +81,11 @@ Spring.addDecoration(new Spring.ElementDecoration({ elementId : 'smoking', widgetType : "dijit.form.RadioButton", - widgetModule : "dijit.form.CheckBox", - widgetAttrs : { value : true }})); + widgetModule : "dijit.form.CheckBox"})); Spring.addDecoration(new Spring.ElementDecoration({ elementId : 'non-smoking', widgetType : "dijit.form.RadioButton", - widgetModule : "dijit.form.CheckBox", - widgetAttrs : { value : false }})); + widgetModule : "dijit.form.CheckBox"})); 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 b9cc6fd5..9b73ed39 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 @@ -203,8 +203,10 @@ public abstract class AbstractMvcView implements View { validate(model); } } - requestContext.getFlashScope().put(ViewActionStateHolder.KEY, - new ViewActionStateHolder(eventId, mappingResults)); + if (mappingResults != null && mappingResults.hasErrorResults()) { + requestContext.getFlashScope().put(ViewActionStateHolder.KEY, + new ViewActionStateHolder(eventId, mappingResults)); + } } public boolean hasFlowEvent() { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java index fced7508..a42344c8 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java @@ -199,7 +199,7 @@ public class BindingModel extends AbstractErrors { } public boolean test(MappingResult result) { - if (field.equals(result.getMapping().getTargetExpression().getExpressionString())) { + if (result.isError() && field.equals(result.getMapping().getTargetExpression().getExpressionString())) { return true; } else { return false; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/mvc/portlet/PortletMvcViewTests.java b/spring-webflow/src/test/java/org/springframework/webflow/mvc/portlet/PortletMvcViewTests.java index 93728a91..65205e19 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/mvc/portlet/PortletMvcViewTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/mvc/portlet/PortletMvcViewTests.java @@ -42,7 +42,7 @@ public class PortletMvcViewTests extends TestCase { public void testResumeEvent() throws Exception { MockRequestContext context = new MockRequestContext(); context.putRequestParameter("_eventId", "submit"); - context.putRequestParameter("booleanProperty", "true"); + context.putRequestParameter("booleanProperty", "bogus"); context.putRequestParameter("_booleanProperty", "whatever"); BindBean bindBean = new BindBean(); StaticExpression modelObject = new StaticExpression(bindBean);