This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 628ab62 Revert ISE fix after review 628ab62 is described below commit 628ab627bd23edea5e80ff5b01958e9bfd4e16fa Author: remm <r...@apache.org> AuthorDate: Tue Jun 4 13:14:21 2019 +0200 Revert ISE fix after review --- .../coyote/http2/WindowAllocationManager.java | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java b/java/org/apache/coyote/http2/WindowAllocationManager.java index 3ddd742..56acab9 100644 --- a/java/org/apache/coyote/http2/WindowAllocationManager.java +++ b/java/org/apache/coyote/http2/WindowAllocationManager.java @@ -146,12 +146,11 @@ class WindowAllocationManager { } else if (waitingFor == waitTarget) { // NO-OP // Non-blocking post-processing may attempt to flush - } else if ((waitTarget & waitingFor) == NONE) { - waitingFor |= waitTarget; } else { throw new IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise", stream.getConnectionId(), stream.getIdentifier())); } + } } @@ -172,19 +171,17 @@ class WindowAllocationManager { } stream.notify(); } else { - waitingFor &= ~notifyTarget; - if (waitingFor == NONE) { - // Non-blocking so dispatch - if (log.isDebugEnabled()) { - log.debug(sm.getString("windowAllocationManager.dispatched", - stream.getConnectionId(), stream.getIdentifier())); - } - stream.getCoyoteResponse().action(ActionCode.DISPATCH_WRITE, null); - // Need to explicitly execute dispatches on the StreamProcessor - // as this thread is being processed by an UpgradeProcessor - // which won't see this dispatch - stream.getCoyoteResponse().action(ActionCode.DISPATCH_EXECUTE, null); + waitingFor = NONE; + // Non-blocking so dispatch + if (log.isDebugEnabled()) { + log.debug(sm.getString("windowAllocationManager.dispatched", + stream.getConnectionId(), stream.getIdentifier())); } + stream.getCoyoteResponse().action(ActionCode.DISPATCH_WRITE, null); + // Need to explicitly execute dispatches on the StreamProcessor + // as this thread is being processed by an UpgradeProcessor + // which won't see this dispatch + stream.getCoyoteResponse().action(ActionCode.DISPATCH_EXECUTE, null); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org