Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · May 13, 2024 · ab3c6e9 · ab3c6e9
2 parents b776573 + 1995b5e
commit ab3c6e9
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java
@@ -39,7 +39,6 @@ public class HttpSenderOverHTTP extends HttpSender
     private final IteratingCallback headersCallback = new HeadersCallback();
     private final IteratingCallback contentCallback = new ContentCallback();
     private final HttpGenerator generator = new HttpGenerator();
-    private HttpExchange exchange;
     private MetaData.Request metaData;
     private ByteBuffer contentBuffer;
     private boolean lastContent;
@@ -62,7 +61,6 @@ protected void sendHeaders(HttpExchange exchange, ByteBuffer contentBuffer, bool
     {
         try
         {
-            this.exchange = exchange;
             this.contentBuffer = contentBuffer;
             this.lastContent = lastContent;
             this.callback = callback;
@@ -91,7 +89,6 @@ protected void sendContent(HttpExchange exchange, ByteBuffer contentBuffer, bool
     {
         try
         {
-            this.exchange = exchange;
             this.contentBuffer = contentBuffer;
             this.lastContent = lastContent;
             this.callback = callback;
@@ -157,6 +154,7 @@ private HeadersCallback()
         protected Action process() throws Exception
         {
             HttpClient httpClient = getHttpChannel().getHttpDestination().getHttpClient();
+            HttpExchange exchange = getHttpExchange();
             ByteBufferPool byteBufferPool = httpClient.getByteBufferPool();
             boolean useDirectByteBuffers = httpClient.isUseOutputDirectByteBuffers();
             while (true)