diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java index d6d2af3e..646d7c0a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java @@ -271,6 +271,7 @@ public class ViewState extends TransitionableState { throw new ViewRenderingException(getOwner().getId(), getId(), view, e); } context.getFlashScope().clear(); + context.getMessageContext().clearMessages(); context.viewRendered(view); } 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 2da84da3..ada08bc8 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 @@ -311,7 +311,7 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable { private MessageContext createMessageContext() { StateManageableMessageContext messageContext = messageContextFactory.createMessageContext(); - Serializable messagesMemento = (Serializable) getFlashScope().get("messagesMemento"); + Serializable messagesMemento = (Serializable) getFlashScope().extract("messagesMemento"); if (messagesMemento != null) { messageContext.restoreMessages(messagesMemento); }