From bc1d1541647bb21a48784bc4b84a804ec0334c99 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Fri, 11 Apr 2008 05:14:28 +0000
Subject: [PATCH] fixed mvc view scope model bug

---
 .../org/springframework/webflow/mvc/view/MvcView.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
index a36edf44..56183382 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java
@@ -184,9 +184,14 @@ public abstract class MvcView implements View {
 	// internal helpers
 
 	private Map flowScopes() {
-		return requestContext.getConversationScope().union(requestContext.getFlowScope()).union(
-				requestContext.getViewScope()).union(requestContext.getFlashScope()).union(
-				requestContext.getRequestScope()).asMap();
+		if (requestContext.getCurrentState().isViewState()) {
+			return requestContext.getConversationScope().union(requestContext.getFlowScope()).union(
+					requestContext.getViewScope()).union(requestContext.getFlashScope()).union(
+					requestContext.getRequestScope()).asMap();
+		} else {
+			return requestContext.getConversationScope().union(requestContext.getFlowScope()).union(
+					requestContext.getFlashScope()).union(requestContext.getRequestScope()).asMap();
+		}
 	}
 
 	private void exposeBindingModel(Map model) {