struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject svn commit: rev 56770 - struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application
Date Sat, 06 Nov 2004 18:15:36 GMT
Author: craigmcc
Date: Sat Nov  6 10:15:35 2004
New Revision: 56770

Modified:
   struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
   struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Log:
Correctly set the "created" flag in FacesRequestProcessor, and comment out
the use of both the wrapped and unwrapped requests.  The wrapper is still
used in the Tiles version.  There is an outstanding bug ticket (32014) that
may change this when it is resolved.

PR: Bugzilla #32047
Reported By:  Chris Fraser <cfraser AT ticketweb.com>


Modified: struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
==============================================================================
--- struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
(original)
+++ struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
Sat Nov  6 10:15:35 2004
@@ -126,13 +126,14 @@
             if (log.isTraceEnabled()) {
                 log.trace("  Creating new FacesContext for '" + uri + "'");
             }
+            created = true;
             FacesContextFactory fcf = (FacesContextFactory)
                 FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
-            HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request, uri);
-            context = fcf.getFacesContext(servlet.getServletContext(), wrapper,
-                                          response, lifecycle); 
-            // Comment out the previous two lines and uncomment
-            // the following line to test eliminating the wrapper
+            // HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request,
uri);
+            // context = fcf.getFacesContext(servlet.getServletContext(), wrapper,
+            //                               response, lifecycle); 
+            // Comment out the previous three lines and uncomment
+            // the following two lines to test eliminating the wrapper
             context = fcf.getFacesContext(servlet.getServletContext(),
                                           request, response, lifecycle);
         }

Modified: struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
==============================================================================
--- struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
(original)
+++ struts/trunk/struts-faces/core-library/src/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Sat Nov  6 10:15:35 2004
@@ -126,12 +126,16 @@
             if (log.isTraceEnabled()) {
                 log.trace("  Creating new FacesContext for '" + uri + "'");
             }
+            created = true;
             FacesContextFactory fcf = (FacesContextFactory)
                 FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
             HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(request, uri);
             context = fcf.getFacesContext(servlet.getServletContext(), wrapper,
-                                          response, lifecycle);
-            created = true;
+                                          response, lifecycle); 
+            // Comment out the previous three lines and uncomment
+            // the following two lines to test eliminating the wrapper
+            // context = fcf.getFacesContext(servlet.getServletContext(),
+            //                               request, response, lifecycle);
         }
 
         // Create a new view root

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message