Clear reference to stream in HPack decoder once headers are processed

apache · Jan 10, 2025 · cbdf826 · cbdf826
1 parent b89bfaf
commit cbdf826
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/java/org/apache/coyote/http2/HpackDecoder.java b/java/org/apache/coyote/http2/HpackDecoder.java
@@ -405,6 +405,11 @@ void setHeaderEmitter(HeaderEmitter headerEmitter) {
     }
 
 
+    void clearHeaderEmitter() {
+        headerEmitter = null;
+    }
+
+
     void setMaxHeaderCount(int maxHeaderCount) {
         this.maxHeaderCount = maxHeaderCount;
     }

diff --git a/java/org/apache/coyote/http2/Http2Parser.java b/java/org/apache/coyote/http2/Http2Parser.java
@@ -643,6 +643,12 @@ protected void onHeadersComplete(int streamId) throws Http2Exception {
                     Http2Error.COMPRESSION_ERROR);
         }
 
+        /*
+         * Clear the reference to the stream in the HPack decoder now that the headers have been processed so that the
+         * HPack decoder does not retain a reference to this stream. This aids GC.
+         */
+        hpackDecoder.clearHeaderEmitter();
+
         synchronized (output) {
             output.headersEnd(streamId, headersEndStream);