#12776 do not repool the buffer when releasing upon failure as the H2…

… flusher might still reference it Signed-off-by: Ludovic Orban <[email protected]>
jetty · Feb 10, 2025 · 8786eb0 · 8786eb0
1 parent c9200a5
commit 8786eb0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
@@ -287,7 +287,7 @@ private void onWriteComplete(boolean last, Throwable failure)
                 _state = State.CLOSED;
                 closedCallback = _closedCallback;
                 _closedCallback = null;
-                releaseBuffer();
+                releaseBuffer(failure);
                 wake = updateApiState(failure);
             }
             else if (_state == State.CLOSE)
@@ -508,7 +508,7 @@ public void completed(Throwable failure)
         try (AutoLock l = _channelState.lock())
         {
             _state = State.CLOSED;
-            releaseBuffer();
+            releaseBuffer(failure);
         }
     }
 
@@ -648,12 +648,15 @@ private ByteBuffer acquireBuffer()
         return _aggregate;
     }
 
-    private void releaseBuffer()
+    private void releaseBuffer(Throwable failure)
     {
         if (_aggregate != null)
         {
             ByteBufferPool bufferPool = _channel.getConnector().getByteBufferPool();
-            bufferPool.release(_aggregate);
+            if (failure == null)
+                bufferPool.release(_aggregate);
+            else
+                bufferPool.remove(_aggregate);
             _aggregate = null;
         }
     }
@@ -1400,7 +1403,7 @@ public void recycle()
             _commitSize = config.getOutputAggregationSize();
             if (_commitSize > _bufferSize)
                 _commitSize = _bufferSize;
-            releaseBuffer();
+            releaseBuffer(null);
             _written = 0;
             _writeListener = null;
             _onError = null;