From b23badc6e5e28e694fdc54282927fee2822010c9 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 13 Mar 2009 19:35:05 +0000 Subject: [PATCH] always save flash messages even if not active --- .../webflow/engine/impl/FlowExecutionImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java index c20a2192..a9e07d7a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java @@ -186,9 +186,9 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable { if (!isActive()) { if (status == FlowExecutionStatus.NOT_STARTED) { throw new IllegalStateException( - "No active FlowSession to access; this flow execution has not been started"); + "No active FlowSession to access; this FlowExecution has not been started"); } else { - throw new IllegalStateException("No active FlowSession to access; this flow execution has ended"); + throw new IllegalStateException("No active FlowSession to access; this FlowExecution has ended"); } } return getActiveSessionInternal(); @@ -225,8 +225,8 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable { } catch (Exception e) { handleException(wrap(e), requestContext); } finally { + saveFlashMessages(requestContext); if (isActive()) { - saveMessages(requestContext); try { listeners.firePaused(requestContext); } catch (Throwable e) { @@ -262,8 +262,8 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable { } catch (Exception e) { handleException(wrap(e), requestContext); } finally { + saveFlashMessages(requestContext); if (isActive()) { - saveMessages(requestContext); try { listeners.firePaused(requestContext); } catch (Throwable e) { @@ -555,7 +555,7 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable { return (FlowSessionImpl) flowSessions.getLast(); } - private void saveMessages(RequestContext context) { + private void saveFlashMessages(RequestContext context) { StateManageableMessageContext messageContext = (StateManageableMessageContext) context.getMessageContext(); Serializable messagesMemento = messageContext.createMessagesMemento(); getFlashScope().put("messagesMemento", messagesMemento);