tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Remy Maucherat <r...@apache.org>
Subject Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Tue, 28 Sep 2004 16:39:59 GMT
yoavs@apache.org wrote:

>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.
>  
>
I think the patch is not so good.

>  
>  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();
>  -
>  
>
Here it doesn't seem good (ok, the case is actually never used) since 
the request would be unwrapped as well.

>           }
>   
>           // Handle an HTTP named dispatcher include
>  @@ -552,9 +550,6 @@
>               invoke(outerRequest, outerResponse);
>   
>               wrequest.recycle();
>  -            unwrapRequest();
>  -            unwrapResponse();
>  -
>  
>
And here the recycling won't get done.

Rémy


---------------------------------------------------------------------
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