[tomcat] branch 8.5.x updated: Fix test failures. Handle full allocation case.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 8d14c6f  Fix test failures. Handle full allocation case.
8d14c6f is described below

commit 8d14c6f21d29768a39be4b6b9517060dc6606758
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 3 21:52:41 2019 +0100

    Fix test failures. Handle full allocation case.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index e5ae91f..a9ab68d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -815,8 +815,10 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
                                 stream.wait(writeTimeout);
                             }
                             // Has this stream been granted an allocation
+                            // Note: If the stream in not in this Map then the
+                            //       requested write has been fully allocated
                             int[] value = backLogStreams.get(stream);
-                            if (value[1] == 0) {
+                            if (value != null && value[1] == 0) {
                                 // No allocation
                                 // Close the connection. Do this first since
                                 // closing the stream will raise an exception


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