You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2011/05/24 10:39:13 UTC

svn commit: r1126931 - /myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java

Author: weber
Date: Tue May 24 08:39:13 2011
New Revision: 1126931

URL: http://svn.apache.org/viewvc?rev=1126931&view=rev
Log:
(TOBAGO-996)  NonFacesRequestServlet doesn't work proper with JSF 1.2  
<https://issues.apache.org/jira/browse/TOBAGO-996>

Modified:
    myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java

Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java?rev=1126931&r1=1126930&r2=1126931&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java Tue May 24 08:39:13 2011
@@ -59,10 +59,8 @@ public abstract class NonFacesRequestSer
       if (LOG.isDebugEnabled()) {
         LOG.debug("outcome = '" + outcome + "'");
       }
-      Application application = facesContext.getApplication();
-      NavigationHandler navigationHandler = application.getNavigationHandler();
-      navigationHandler.handleNavigation(facesContext, null, outcome);
 
+      Application application = facesContext.getApplication();
       if (facesContext.getViewRoot() == null) {
         ViewHandler viewHandler = application.getViewHandler();
         String viewId = getFromViewId();
@@ -70,6 +68,9 @@ public abstract class NonFacesRequestSer
         facesContext.setViewRoot(view);
       }
 
+      NavigationHandler navigationHandler = application.getNavigationHandler();
+      navigationHandler.handleNavigation(facesContext, null, outcome);
+
       lifecycle.render(facesContext);
     } finally {
       facesContext.release();