diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java index 73eea102..5757ec12 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/ServletMvcView.java @@ -20,13 +20,14 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.core.convert.ConversionService; import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.mvc.view.AbstractMvcView; /** * The Spring Web Servlet MVC view implementation. - * + * * @author Keith Donald */ public class ServletMvcView extends AbstractMvcView { @@ -47,6 +48,10 @@ public class ServletMvcView extends AbstractMvcView { HttpServletResponse response = (HttpServletResponse) externalContext.getNativeResponse(); request.setAttribute(org.springframework.web.servlet.support.RequestContext.WEB_APPLICATION_CONTEXT_ATTRIBUTE, context.getActiveFlow().getApplicationContext()); + // spring:eval tag + if (getConversionService() != null) { + request.setAttribute(ConversionService.class.getName(), getConversionService().getDelegateConversionService()); + } getView().render(model, request, response); } 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 4a3cf3bb..d6801d89 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 @@ -284,6 +284,13 @@ public abstract class AbstractMvcView implements View { return view; } + /** + * @return the configured ConversionService + */ + protected ConversionService getConversionService() { + return conversionService; + } + /** * Template method subclasses should override to execute the view rendering logic. * @param model the view model data