From 298635220073373d71c29aba3499a0cbbadb42a6 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 22 Apr 2008 19:53:53 +0000
Subject: [PATCH] jsf lifecycle updates

---
 .../main/java/org/springframework/faces/webflow/JsfView.java    | 2 +-
 .../java/org/springframework/faces/webflow/JsfViewFactory.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java
index 38a0b12c..51b5c129 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java
@@ -101,7 +101,7 @@ public class JsfView implements View {
 		FacesContext facesContext = FlowFacesContext.newInstance(requestContext, facesLifecycle);
 		facesContext.setViewRoot(viewRoot);
 		try {
-			if (restored && !facesContext.getResponseComplete() && !facesContext.getRenderResponse()) {
+			if (restored && !facesContext.getRenderResponse() && !facesContext.getResponseComplete()) {
 				facesLifecycle.execute(facesContext);
 				// TODO move this and renderResponse behavior into lifecycle
 				validateModel(facesContext);
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
index 9076c742..588ee9ee 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
@@ -103,7 +103,7 @@ public class JsfViewFactory implements ViewFactory {
 					}
 					view = createJsfView(viewHandler.createView(facesContext, viewName), lifecycle, context);
 					facesContext.setViewRoot(view.getViewRoot());
-					view.setRestored(true);
+					view.setRestored(false);
 				}
 			}
 			if (!facesContext.getRenderResponse()) {