Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9BEB99C8 for ; Tue, 12 Jun 2012 04:09:13 +0000 (UTC) Received: (qmail 6175 invoked by uid 500); 12 Jun 2012 04:09:12 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 6079 invoked by uid 500); 12 Jun 2012 04:09:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 6037 invoked by uid 99); 12 Jun 2012 04:09:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 04:09:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 04:09:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BEFBC2388865; Tue, 12 Jun 2012 04:08:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1349113 - in /geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat: GeronimoStandardContext.java interceptor/RequestListenerBeforeAfter.java Date: Tue, 12 Jun 2012 04:08:48 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120612040848.BEFBC2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Tue Jun 12 04:08:48 2012 New Revision: 1349113 URL: http://svn.apache.org/viewvc?rev=1349113&view=rev Log: GERONIMO-6316 Add logic for requestDestroy listener method to fix the tck failures Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/RequestListenerBeforeAfter.java Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=1349113&r1=1349112&r2=1349113&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original) +++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Tue Jun 12 04:08:48 2012 @@ -902,6 +902,11 @@ public class GeronimoStandardContext ext public boolean fireRequestDestroyEvent(ServletRequest request) { return true; } + + + public boolean fireRequestDestroyEventInBeforeAfter(ServletRequest request) { + return super.fireRequestDestroyEvent(request); + } public boolean fireRequestInitEventInBeforeAfter(ServletRequest request) { return super.fireRequestInitEvent(request); Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/RequestListenerBeforeAfter.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/RequestListenerBeforeAfter.java?rev=1349113&r1=1349112&r2=1349113&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/RequestListenerBeforeAfter.java (original) +++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/RequestListenerBeforeAfter.java Tue Jun 12 04:08:48 2012 @@ -53,6 +53,13 @@ public class RequestListenerBeforeAfter public void after(BeforeAfterContext beforeAfterContext, ServletRequest httpRequest, ServletResponse httpResponse, int dispatch) { + if (httpRequest != null && httpResponse != null) { + DispatcherType dispatcherType = httpRequest.getDispatcherType(); + if (dispatcherType == DispatcherType.REQUEST + || (dispatcherType == DispatcherType.FORWARD && standardContext.getFireRequestListenersOnForwards())) { + standardContext.fireRequestDestroyEventInBeforeAfter(httpRequest); + } + } if (next != null) { next.after(beforeAfterContext, httpRequest, httpResponse, dispatch); }