fix BlockingTest.testBlockingReadAndBlockingWriteGzipped hanging b/c …

…two writes are being done but only one got its callback failed Signed-off-by: Ludovic Orban <[email protected]>
jetty · Dec 9, 2024 · debb110 · debb110
1 parent 546cdd9
commit debb110
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java b/...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
@@ -1340,8 +1340,9 @@ public void failed(Throwable x)
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("write failed {}", this, x);
-            Callback callback;
+            Callback callback = null;
             HttpChannelState httpChannel;
+            Throwable noChannelFailure = null;
             try (AutoLock ignored = _request._lock.lock())
             {
                 _writeFailure = x;
@@ -1350,8 +1351,22 @@ public void failed(Throwable x)
                 httpChannel = _request.lockedGetHttpChannelState();
                 httpChannel.lockedStreamSendCompleted(false);
             }
-            if (callback != null)
-                httpChannel._writeInvoker.run(() -> HttpChannelState.failed(callback, x));
+            catch (Throwable failure)
+            {
+                httpChannel = null;
+                noChannelFailure = failure;
+            }
+
+            if (httpChannel == null)
+            {
+                // Channel already completed, just fail the callback.
+                HttpChannelState.failed(callback, noChannelFailure);
+            }
+            else
+            {
+                Callback cb = callback;
+                httpChannel._writeInvoker.run(() -> HttpChannelState.failed(cb, x));
+            }
         }
 
         @Override