From 0073f541dca0ca92ed546ed30cd4c8316aadfde9 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 24 Apr 2008 13:55:36 +0000
Subject: [PATCH] cachSeconds = 0

---
 .../webflow/mvc/portlet/FlowHandlerAdapter.java            | 7 +++++--
 .../webflow/mvc/servlet/FlowHandlerAdapter.java            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
index 9d82d7aa..9ce8991a 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.springframework.web.portlet.HandlerAdapter;
 import org.springframework.web.portlet.ModelAndView;
-import org.springframework.web.portlet.context.PortletApplicationObjectSupport;
+import org.springframework.web.portlet.handler.PortletContentGenerator;
 import org.springframework.webflow.context.portlet.DefaultFlowUrlHandler;
 import org.springframework.webflow.context.portlet.FlowUrlHandler;
 import org.springframework.webflow.context.portlet.PortletExternalContext;
@@ -52,7 +52,7 @@ import org.springframework.webflow.executor.FlowExecutor;
  * @author Keith Donald
  * @author Scott Andrews
  */
-public class FlowHandlerAdapter extends PortletApplicationObjectSupport implements HandlerAdapter, InitializingBean {
+public class FlowHandlerAdapter extends PortletContentGenerator implements HandlerAdapter, InitializingBean {
 
 	private static final String ACTION_REQUEST_FLOW_EXCEPTION_ATTRIBUTE = "actionRequestFlowException";
 
@@ -67,6 +67,8 @@ public class FlowHandlerAdapter extends PortletApplicationObjectSupport implemen
 	 * @see #afterPropertiesSet()
 	 */
 	public FlowHandlerAdapter() {
+		// prevent caching of flow pages by default
+		setCacheSeconds(0);
 	}
 
 	/**
@@ -112,6 +114,7 @@ public class FlowHandlerAdapter extends PortletApplicationObjectSupport implemen
 
 	public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object handler) throws Exception {
 		FlowHandler flowHandler = (FlowHandler) handler;
+		checkAndPrepare(request, response);
 		populateConveniencePortletProperties(request);
 		PortletSession session = request.getPortletSession(false);
 		if (session != null) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
index 9cc21e74..4d4b5e66 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
@@ -151,8 +151,8 @@ public class FlowHandlerAdapter extends WebContentGenerator implements HandlerAd
 
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
-		checkAndPrepare(request, response, false);
 		FlowHandler flowHandler = (FlowHandler) handler;
+		checkAndPrepare(request, response, false);
 		String flowExecutionKey = flowUrlHandler.getFlowExecutionKey(request);
 		if (flowExecutionKey != null) {
 			try {