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
The following commit(s) were added to refs/heads/7.0.x by this push:
new e68d6f8 Align with 8.5.x to ease back-ports.
e68d6f8 is described below
commit e68d6f83e550531591bf41a172fb36fdd3393029
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 11 13:25:01 2019 +0100
Align with 8.5.x to ease back-ports.
---
java/org/apache/coyote/AsyncStateMachine.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index d4df0ff..0c1bcec 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -132,8 +132,7 @@ public class AsyncStateMachine<S> {
/**
* The string manager for this package.
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(AsyncStateMachine.class);
private enum AsyncState {
DISPATCHED (false, false, false, false),
@@ -241,11 +240,7 @@ public class AsyncStateMachine<S> {
} else if (state == AsyncState.STARTING) {
state = AsyncState.STARTED;
return SocketState.LONG;
- } else if (state == AsyncState.MUST_COMPLETE) {
- asyncCtxt.fireOnComplete();
- state = AsyncState.DISPATCHED;
- return SocketState.ASYNC_END;
- } else if (state == AsyncState.COMPLETING) {
+ } else if (state == AsyncState.MUST_COMPLETE || state ==
AsyncState.COMPLETING) {
asyncCtxt.fireOnComplete();
state = AsyncState.DISPATCHED;
return SocketState.ASYNC_END;
@@ -297,7 +292,6 @@ public class AsyncStateMachine<S> {
throw new IllegalStateException(
sm.getString("asyncStateMachine.invalidAsyncState",
"asyncComplete()", state));
-
}
return triggerDispatch;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
