[tomcat] branch 8.5.x updated: Potential fix for failing CI tests at GitHub

[markt]

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 50484f0  Potential fix for failing CI tests at GitHub
50484f0 is described below

commit 50484f0b3a44cbe6599d18449c6d8f6454355310
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 23 10:42:14 2021 +0000

    Potential fix for failing CI tests at GitHub
---
 java/org/apache/coyote/http2/Stream.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 13ea2b5..e10fa5c 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1252,9 +1252,11 @@ class Stream extends AbstractNonZeroStream implements 
HeaderEmitter {
         }
 
         private final void swallowUnread() throws IOException {
+            synchronized (this) {
+                closed = true;
+            }
             if (inBuffer != null) {
                 synchronized (inBuffer) {
-                    closed = true;
                     int unreadByteCount = inBuffer.position();
                     if (log.isDebugEnabled()) {
                         
log.debug(sm.getString("stream.inputBuffer.swallowUnread", 
Integer.valueOf(unreadByteCount)));

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