From ed1cadc449bfd711e7fb5d4d409e4eb57be9321b Mon Sep 17 00:00:00 2001
From: Ludovic Orban <lorban@bitronix.be>
Date: Wed, 28 Aug 2024 19:43:54 +0200
Subject: [PATCH] fix npe when onCompleteFailure happens after reset (#12199)

Fix npe when onCompleteFailure happens after reset

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
---
 .../org/eclipse/jetty/client/transport/HttpSender.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java
index 55476b7f48ce..69bade58dd68 100644
--- a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java
+++ b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java
@@ -386,8 +386,11 @@ private void externalAbort(Throwable failure, Promise<Boolean> promise)
         }
     }
 
-    private void internalAbort(HttpExchange exchange, Throwable failure)
+    private void internalAbort(Throwable failure)
     {
+        HttpExchange exchange = getHttpExchange();
+        if (exchange == null)
+            return;
         anyToFailure(failure);
         abortRequest(exchange);
     }
@@ -626,7 +629,7 @@ protected void onCompleteFailure(Throwable x)
             }
 
             failRequest(x);
-            internalAbort(exchange, x);
+            internalAbort(x);
 
             Promise<Boolean> promise = abort;
             if (promise != null)