fix npe when onCompleteFailure happens after reset (#12199)

lorban · web-flow · commit ed1cadc449bf · 2024-08-28T19:43:54.000+02:00
Fix npe when onCompleteFailure happens after reset

Signed-off-by: Ludovic Orban &lt;lorban@bitronix.be&gt;
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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -386,8 +386,11 @@ private void externalAbort(Throwable failure, Promise<Boolean> promise)`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
`389`		`- private void internalAbort(HttpExchange exchange, Throwable failure)`
	`389`	`+ private void internalAbort(Throwable failure)`
`390`	`390`	`{`
	`391`	`+ HttpExchange exchange = getHttpExchange();`
	`392`	`+ if (exchange == null)`
	`393`	`+ return;`
`391`	`394`	`anyToFailure(failure);`
`392`	`395`	`abortRequest(exchange);`
`393`	`396`	`}`
`@@ -626,7 +629,7 @@ protected void onCompleteFailure(Throwable x)`
`626`	`629`	`}`
`627`	`630`
`628`	`631`	`failRequest(x);`
`629`		`- internalAbort(exchange, x);`
	`632`	`+ internalAbort(x);`
`630`	`633`
`631`	`634`	`Promise<Boolean> promise = abort;`
`632`	`635`	`if (promise != null)`