You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/25 09:44:05 UTC

[tomcat] branch 8.5.x updated: Make sure recycle() is called once the Stream is closed

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 abdd02d  Make sure recycle() is called once the Stream is closed
abdd02d is described below

commit abdd02d564be967f15b3f67c5bc852842c6edf47
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 25 10:42:37 2020 +0100

    Make sure recycle() is called once the Stream is closed
---
 java/org/apache/coyote/http2/StreamProcessor.java | 4 ++++
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/java/org/apache/coyote/http2/StreamProcessor.java b/java/org/apache/coyote/http2/StreamProcessor.java
index 6839b43..0106cf4 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -97,7 +97,11 @@ class StreamProcessor extends AbstractProcessor {
                     ConnectionException ce = new ConnectionException(msg, Http2Error.INTERNAL_ERROR);
                     ce.initCause(e);
                     stream.close(ce);
+                    state = SocketState.CLOSED;
                 } finally {
+                    if (state == SocketState.CLOSED) {
+                        recycle();
+                    }
                     ContainerThreadMarker.clear();
                 }
             }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7d2fea..3a1dd94 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -96,6 +96,10 @@
         white space around cookie attrubute names and values when using the RFC
         6265 cookie processor. (markt)
       </fix>
+      <fix>
+        Once an HTTP/2 stream has been closed, ensure that the code that cleans
+        up references that are no longer required is called. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">


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