Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 43888 invoked from network); 31 Dec 2006 00:33:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Dec 2006 00:33:46 -0000 Received: (qmail 39356 invoked by uid 500); 31 Dec 2006 00:33:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 39305 invoked by uid 500); 31 Dec 2006 00:33:50 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 39294 invoked by uid 500); 31 Dec 2006 00:33:50 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 39291 invoked by uid 99); 31 Dec 2006 00:33:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Dec 2006 16:33:50 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Dec 2006 16:33:42 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4951D1A981A; Sat, 30 Dec 2006 16:32:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r491354 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Date: Sun, 31 Dec 2006 00:32:48 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061231003248.4951D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sat Dec 30 16:32:47 2006 New Revision: 491354 URL: http://svn.apache.org/viewvc?view=rev&rev=491354 Log: Port Filip's improvement to the fix for bug 34956 from TC6. Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=491354&r1=491353&r2=491354 ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Sat Dec 30 16:32:47 2006 @@ -972,6 +972,14 @@ boolean same = false; ServletRequest dispatchedRequest = appRequest; + //find the request that was passed into the service method + while (originalRequest instanceof ServletRequestWrapper && + ((ServletRequestWrapper) originalRequest).getRequest()!=null) { + originalRequest = + ((ServletRequestWrapper) originalRequest).getRequest(); + } + + //compare with the dispatched request while (!same) { if (originalRequest.equals(dispatchedRequest)) { same = true; @@ -991,6 +999,15 @@ same = false; ServletResponse dispatchedResponse = appResponse; + //find the response that was passed into the service method + while (originalResponse instanceof ServletResponseWrapper && + ((ServletResponseWrapper) originalResponse).getResponse() != + null) { + originalResponse = + ((ServletResponseWrapper) originalResponse).getResponse(); + } + + //compare with the dispatched response while (!same) { if (originalResponse.equals(dispatchedResponse)) { same = true; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org