tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1373142 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Date Tue, 14 Aug 2012 22:14:39 GMT
Author: markt
Date: Tue Aug 14 22:14:39 2012
New Revision: 1373142

URL: http://svn.apache.org/viewvc?rev=1373142&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53624
Remove some include specific code from dispatch, copied when the doDispatch() method was created.
Note that this bug report pre-dates that copy. At the time of the bug report dispatch was
implemented by calling include()

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1373142&r1=1373141&r2=1373142&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Tue Aug 14 22:14:39
2012
@@ -611,29 +611,15 @@ final class ApplicationDispatcher implem
             throws ServletException, IOException {
 
         // Set up to handle the specified request and response
-        State state = new State(request, response, true);
+        State state = new State(request, response, false);
 
         // Create a wrapped response to use for this request
         wrapResponse(state);
 
         ApplicationHttpRequest wrequest =
             (ApplicationHttpRequest) wrapRequest(state);
-        String contextPath = context.getPath();
-        if (requestURI != null)
-            wrequest.setAttribute(RequestDispatcher.INCLUDE_REQUEST_URI,
-                                  requestURI);
-        if (contextPath != null)
-            wrequest.setAttribute(RequestDispatcher.INCLUDE_CONTEXT_PATH,
-                                  contextPath);
-        if (servletPath != null)
-            wrequest.setAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH,
-                                  servletPath);
-        if (pathInfo != null)
-            wrequest.setAttribute(RequestDispatcher.INCLUDE_PATH_INFO,
-                                  pathInfo);
+
         if (queryString != null) {
-            wrequest.setAttribute(RequestDispatcher.INCLUDE_QUERY_STRING,
-                                  queryString);
             wrequest.setQueryParams(queryString);
         }
 
@@ -642,7 +628,7 @@ final class ApplicationDispatcher implem
         wrequest.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
                 getCombinedPath());
 
-        wrequest.setContextPath(contextPath);
+        wrequest.setContextPath(context.getPath());
         wrequest.setRequestURI(requestURI);
         wrequest.setServletPath(servletPath);
         wrequest.setPathInfo(pathInfo);



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


Mime
View raw message