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

always save flash messages even if not active

Browse Source
This commit is contained in:
Keith Donald
2009-03-13 19:35:05 +00:00
parent 7b9046cdf4
commit b23badc6e5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java
View File

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