This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f353d63c7df7113b70b6c35b3d203879382e0efa Author: Mark Thomas <[email protected]> AuthorDate: Tue Oct 15 21:16:11 2019 +0100 Refactor --- java/org/apache/coyote/AsyncStateMachine.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/java/org/apache/coyote/AsyncStateMachine.java b/java/org/apache/coyote/AsyncStateMachine.java index 98df79c..8363afa 100644 --- a/java/org/apache/coyote/AsyncStateMachine.java +++ b/java/org/apache/coyote/AsyncStateMachine.java @@ -232,11 +232,9 @@ public class AsyncStateMachine<S> { */ public synchronized SocketState asyncPostProcess() { if (state == AsyncState.COMPLETE_PENDING) { - clearNonBlockingListeners(); state = AsyncState.COMPLETING; return SocketState.ASYNC_END; } else if (state == AsyncState.DISPATCH_PENDING) { - clearNonBlockingListeners(); state = AsyncState.DISPATCHING; return SocketState.ASYNC_END; } else if (state == AsyncState.STARTING) { @@ -268,13 +266,8 @@ public class AsyncStateMachine<S> { if (!ContainerThreadMarker.isContainerThread() && state == AsyncState.STARTING) { state = AsyncState.COMPLETE_PENDING; return false; - } else { - return doComplete(); } - } - - private synchronized boolean doComplete() { boolean triggerDispatch = false; if (state == AsyncState.STARTING || state == AsyncState.MUST_ERROR) { // Processing is on a container thread so no need to transfer @@ -329,13 +322,8 @@ public class AsyncStateMachine<S> { if (!ContainerThreadMarker.isContainerThread() && state == AsyncState.STARTING) { state = AsyncState.DISPATCH_PENDING; return false; - } else { - return doDispatch(); } - } - - private synchronized boolean doDispatch() { boolean triggerDispatch = false; if (state == AsyncState.STARTING || state == AsyncState.MUST_ERROR) { // Processing is on a container thread so no need to transfer --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
