Author: markt Date: Fri Apr 22 12:57:50 2016 New Revision: 1740509 URL: http://svn.apache.org/viewvc?rev=1740509&view=rev Log: Fix regression between first and second parts of fix for BZ 59219
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/trunk/java/org/apache/coyote/ActionCode.java tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.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 Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Apr 22 12:57:50 2016 @@ -1645,6 +1645,16 @@ public class Request implements HttpServ return asyncContext; } + public boolean isAsyncStarting() { + if (asyncContext == null) { + return false; + } + + AtomicBoolean result = new AtomicBoolean(false); + coyoteRequest.action(ActionCode.ASYNC_IS_STARTING, result); + return result.get(); + } + @Override public boolean isAsyncStarted() { if (asyncContext == null) { Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Apr 22 12:57:50 2016 @@ -104,7 +104,7 @@ public class ErrorReportValve extends Va // CoyoteAdapter will trigger the necessary processing. It is only // necessary to trigger it here if async is starting (i.e. this is // the post-processing of the service() method) - if (throwable != null && request.isAsyncDispatching()) { + if (throwable != null && request.isAsyncStarting()) { request.getAsyncContextInternal().setErrorState(throwable, true); } return; Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original) +++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Fri Apr 22 12:57:50 2016 @@ -164,6 +164,11 @@ public enum ActionCode { ASYNC_IS_ASYNC, /** + * Callback to determine if async processing is starting. + */ + ASYNC_IS_STARTING, + + /** * Callback to determine if async dispatch is in progress. */ ASYNC_IS_STARTED, Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] (original) +++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Fri Apr 22 12:57:50 2016 @@ -179,6 +179,10 @@ public class AsyncStateMachine { return state.isDispatching(); } + public boolean isAsyncStarting() { + return state == AsyncState.STARTING; + } + public boolean isAsyncStarted() { return state.isStarted(); } 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=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Apr 22 12:57:50 2016 @@ -571,6 +571,10 @@ public class AjpProcessor extends Abstra ((AtomicBoolean) param).set(asyncStateMachine.isAsyncError()); break; } + case ASYNC_IS_STARTING: { + ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarting()); + break; + } case ASYNC_IS_STARTED: { ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarted()); break; 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=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Apr 22 12:57:50 2016 @@ -876,6 +876,10 @@ public class Http11Processor extends Abs ((AtomicBoolean) param).set(asyncStateMachine.isAsyncError()); break; } + case ASYNC_IS_STARTING: { + ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarting()); + break; + } case ASYNC_IS_STARTED: { ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarted()); break; 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=1740509&r1=1740508&r2=1740509&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Apr 22 12:57:50 2016 @@ -291,6 +291,10 @@ public class StreamProcessor extends Abs ((AtomicBoolean) param).set(asyncStateMachine.isAsyncError()); break; } + case ASYNC_IS_STARTING: { + ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarting()); + break; + } case ASYNC_IS_STARTED: { ((AtomicBoolean) param).set(asyncStateMachine.isAsyncStarted()); break; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org