diff --git a/spring-webflow/changelog.txt b/spring-webflow/changelog.txt index 752ec9bc..54d5aea4 100644 --- a/spring-webflow/changelog.txt +++ b/spring-webflow/changelog.txt @@ -21,6 +21,7 @@ Package org.springframework.webflow.executor the flow execution (SWF-745). * FlowPhaseListener will now save the JSF component state before a flow execution redirect is issued (SWF-747). * Fixed FlowPhaseListener to correctly deal with scenarios where we fallback to standard JSF navigation. +* Fixed use of wrong flow execution key in externalRedirect view when using PortletFlowController (SWF-435). Changes in version 1.0.5 (03.10.2007) ------------------------------------- @@ -969,7 +970,7 @@ Changes in version PR3 (22.5.2005) * Pluggable expression evaluation capability. * Pluggability for all core definition objects: Flow, State, Transition, action, ... * Pluggability of transaction synchronizer interface for custom application-transaction demarcation. -* A lot of general refining and polishing – package structure should be stable now. +* A lot of general refining and polishing � package structure should be stable now. * Flow attribute mapping is now possible from a XML definition using the new "input", and "output" mapping elements within the "attribute-mapper" element (see the spring-webflow.dtd). * FlowController now provides a setFlow(Flow) method for convenience. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java index 969a4c0c..05d4cfc1 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java @@ -60,12 +60,11 @@ import org.springframework.webflow.executor.support.ResponseInstructionHandler; * result from technical limitations in the Portlet API, for instance the fact that a render request cannot issue a * redirect. Keep the following in mind when developing Portlets using Spring Web Flow: * @@ -224,7 +223,8 @@ public class PortletFlowController extends AbstractController implements Initial protected void handleExternalRedirect(ExternalRedirect redirect) throws Exception { // issue the redirect to the external URL - String url = argumentHandler.createExternalUrl(redirect, flowExecutionKey, context); + String url = argumentHandler.createExternalUrl(redirect, responseInstruction.getFlowExecutionKey(), + context); response.sendRedirect(url); }