You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/08/12 20:45:45 UTC

svn commit: r565112 - /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java

Author: imario
Date: Sun Aug 12 11:45:45 2007
New Revision: 565112

URL: http://svn.apache.org/viewvc?view=rev&rev=565112
Log:
check if we have a responseComplete after assertConversationState to avoid further processing

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java?view=diff&rev=565112&r1=565111&r2=565112
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java Sun Aug 12 11:45:45 2007
@@ -42,6 +42,11 @@
 			PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
 		{
 			assertConversationState(event.getFacesContext());
+			if (event.getFacesContext().getResponseComplete())
+			{
+				// we have a redirect ... stop now
+				return;
+			}
 		}
 
 		if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
@@ -60,10 +65,12 @@
 		if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId()))
 		{
 			assertConversationState(event.getFacesContext());
-		}
+			if (event.getFacesContext().getResponseComplete())
+			{
+				// we have a redirect ... stop now
+				return;
+			}
 
-		if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId()))
-		{
 			postRestoreView(event.getFacesContext());
 		}
 	}