[tomcat] branch master updated: Waiting for the same thing is still an error though

[remm]

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 71fcb34  Waiting for the same thing is still an error though
71fcb34 is described below

commit 71fcb34db252c1a7b93130536444443ff8b986dd
Author: remm <r...@apache.org>
AuthorDate: Tue Jun 4 11:11:08 2019 +0200

    Waiting for the same thing is still an error though
---
 java/org/apache/coyote/http2/WindowAllocationManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/WindowAllocationManager.java 
b/java/org/apache/coyote/http2/WindowAllocationManager.java
index 6510312..3ddd742 100644
--- a/java/org/apache/coyote/http2/WindowAllocationManager.java
+++ b/java/org/apache/coyote/http2/WindowAllocationManager.java
@@ -146,8 +146,11 @@ class WindowAllocationManager {
             } else if (waitingFor == waitTarget) {
                 // NO-OP
                 // Non-blocking post-processing may attempt to flush
-            } else {
+            } else if ((waitTarget & waitingFor) == NONE) {
                 waitingFor |= waitTarget;
+            } else {
+                throw new 
IllegalStateException(sm.getString("windowAllocationManager.waitFor.ise",
+                        stream.getConnectionId(), stream.getIdentifier()));
             }
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org