Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 89017 invoked from network); 28 Sep 2004 16:40:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 28 Sep 2004 16:40:15 -0000 Received: (qmail 53449 invoked by uid 500); 28 Sep 2004 16:40:03 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 53286 invoked by uid 500); 28 Sep 2004 16:40:02 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 53164 invoked by uid 99); 28 Sep 2004 16:40:01 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 28 Sep 2004 09:40:00 -0700 Received: (qmail 88786 invoked from network); 28 Sep 2004 16:39:58 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by 127.0.0.1 with SMTP; 28 Sep 2004 16:39:58 -0000 Message-ID: <415993DF.9050208@apache.org> Date: Tue, 28 Sep 2004 18:39:59 +0200 From: Remy Maucherat User-Agent: Mozilla Thunderbird 0.8 (Windows/20040913) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml References: <20040928132312.40782.qmail@minotaur.apache.org> In-Reply-To: <20040928132312.40782.qmail@minotaur.apache.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Rating: 127.0.0.1 1.6.2 0/1000/N X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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