Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cachSeconds = 0

Browse Source
This commit is contained in:
Keith Donald
2008-04-24 13:55:36 +00:00
parent c90f331b1c
commit 0073f541dc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
View File

@@ -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) {

2
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
View File

@@ -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 {