Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0BED8199A3 for ; Tue, 19 Apr 2016 18:43:47 +0000 (UTC) Received: (qmail 60515 invoked by uid 500); 19 Apr 2016 18:43:46 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 60434 invoked by uid 500); 19 Apr 2016 18:43:46 -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 60424 invoked by uid 99); 19 Apr 2016 18:43:46 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2016 18:43:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 24112C0D0D for ; Tue, 19 Apr 2016 18:43:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id B5iIeg0i276o for ; Tue, 19 Apr 2016 18:43:44 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id D75315FB68 for ; Tue, 19 Apr 2016 18:43:43 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C0F5FE0095 for ; Tue, 19 Apr 2016 18:43:42 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DC2C93A022C for ; Tue, 19 Apr 2016 18:43:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1739975 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/ webapps/docs/ Date: Tue, 19 Apr 2016 18:43:41 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160419184341.DC2C93A022C@svn01-us-west.apache.org> Author: markt Date: Tue Apr 19 18:43:41 2016 New Revision: 1739975 URL: http://svn.apache.org/viewvc?rev=1739975&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59220 Ensure that AsyncListener.onComplete() is called if the async request times out and the response is already committed. Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/trunk/java/org/apache/coyote/ActionCode.java tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Apr 19 18:43:41 2016 @@ -253,6 +253,12 @@ public class CoyoteAdapter implements Ad AtomicBoolean error = new AtomicBoolean(false); res.action(ActionCode.IS_ERROR, error); if (error.get()) { + if (request.isAsyncCompleting()) { + // Connection will be forcibly closed which will prevent + // completion happening at the usual point. Need to trigger + // call to onComplete() here. + res.action(ActionCode.ASYNC_POST_PROCESS, null); + } success = false; } } catch (IOException e) { Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original) +++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Tue Apr 19 18:43:41 2016 @@ -189,6 +189,12 @@ public enum ActionCode { ASYNC_IS_ERROR, /** + * Callback to trigger post processing. Typically only used during error + * handling to trigger essential processing that otherwise would be skipped. + */ + ASYNC_POST_PROCESS, + + /** * Callback to trigger the HTTP upgrade process. */ UPGRADE, Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Apr 19 18:43:41 2016 @@ -596,6 +596,10 @@ public class AjpProcessor extends Abstra result.set(asyncStateMachine.asyncTimeout()); break; } + case ASYNC_POST_PROCESS: { + asyncStateMachine.asyncPostProcess(); + break; + } // Servlet 3.1 non-blocking I/O case REQUEST_BODY_FULLY_READ: { Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Apr 19 18:43:41 2016 @@ -901,6 +901,10 @@ public class Http11Processor extends Abs result.set(asyncStateMachine.asyncTimeout()); break; } + case ASYNC_POST_PROCESS: { + asyncStateMachine.asyncPostProcess(); + break; + } // Servlet 3.1 non-blocking I/O case REQUEST_BODY_FULLY_READ: { Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Apr 19 18:43:41 2016 @@ -316,6 +316,10 @@ public class StreamProcessor extends Abs result.set(asyncStateMachine.asyncTimeout()); break; } + case ASYNC_POST_PROCESS: { + asyncStateMachine.asyncPostProcess(); + break; + } // Servlet 3.1 non-blocking I/O case REQUEST_BODY_FULLY_READ: { Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1739975&r1=1739974&r2=1739975&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 19 18:43:41 2016 @@ -84,6 +84,11 @@ if an Exception is thrown during async processing. (markt) + 59220: Ensure that AsyncListener.onComplete() is + called if the async request times out and the response is already + committed. (markt) + + 59255: Fix possible NPE in mapper. (kkolinko/remm) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org