tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Tue, 28 Sep 2004 13:23:12 GMT
yoavs       2004/09/28 06:23:11

  Modified:    catalina/src/share/org/apache/catalina/core Tag: TOMCAT_5_0
                        ApplicationDispatcher.java
               webapps/docs Tag: TOMCAT_5_0 changelog.xml
  Log:
  Bugzilla 30949: moved ApplicationDispatcher's unwrap calls to the invoke method so that
they're done even if errors occur in the include.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.34.2.1  +6 -9      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
  
  Index: ApplicationDispatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
  retrieving revision 1.34
  retrieving revision 1.34.2.1
  diff -u -r1.34 -r1.34.2.1
  --- ApplicationDispatcher.java	7 Jun 2004 17:32:15 -0000	1.34
  +++ ApplicationDispatcher.java	28 Sep 2004 13:23:11 -0000	1.34.2.1
  @@ -531,8 +531,6 @@
                                                new Integer(ApplicationFilterFactory.INCLUDE));
               request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
               invoke(request, outerResponse);
  -            unwrapResponse();
  -
           }
   
           // Handle an HTTP named dispatcher include
  @@ -552,9 +550,6 @@
               invoke(outerRequest, outerResponse);
   
               wrequest.recycle();
  -            unwrapRequest();
  -            unwrapResponse();
  -
           }
   
           // Handle an HTTP path based include
  @@ -590,9 +585,6 @@
               invoke(outerRequest, outerResponse);
   
               wrequest.recycle();
  -            unwrapRequest();
  -            unwrapResponse();
  -
           }
   
       }
  @@ -795,6 +787,11 @@
           // Reset the old context class loader
           if (oldCCL != null)
               Thread.currentThread().setContextClassLoader(oldCCL);
  +
  +        // Unwrap the request and response if needed
  +        // See Bugzilla 30949
  +        unwrapRequest();
  +        unwrapResponse();
   
           // Rethrow an exception if one was thrown by the invoked servlet
           if (ioException != null)
  
  
  
  No                   revision
  No                   revision
  1.70.2.44 +3 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.43
  retrieving revision 1.70.2.44
  diff -u -r1.70.2.43 -r1.70.2.44
  --- changelog.xml	27 Sep 2004 15:28:49 -0000	1.70.2.43
  +++ changelog.xml	28 Sep 2004 13:23:11 -0000	1.70.2.44
  @@ -91,6 +91,9 @@
         <fix>
           <bug>31362</bug>: Missing -Xdebug in catalina.bat when using JPDA and
Security. (yoavs)
         </fix>
  +      <fix>
  +        <bug>30949</bug>: Make sure ApplicationDispatcher unwraps requests
even if include fails. (yoavs)
  +      </fix>
       </changelog>
     </subsection>
     <subsection name="Webapps">
  
  
  

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


Mime
View raw message