handle review comments

Signed-off-by: Ludovic Orban <[email protected]>
jetty · Dec 10, 2024 · 1a8c6f2 · 1a8c6f2
1 parent fe418fd
commit 1a8c6f2
Showing 1 changed file with 18 additions and 33 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
@@ -1314,29 +1314,22 @@ public void succeeded()
                 LOG.debug("write succeeded {}", this);
             Callback callback;
             HttpChannelState httpChannel;
-            Throwable noChannelFailure = null;
             try (AutoLock ignored = _request._lock.lock())
             {
                 callback = _writeCallback;
                 _writeCallback = null;
-                httpChannel = _request.lockedGetHttpChannelState();
-                httpChannel.lockedStreamSendCompleted(true);
-            }
-            catch (Throwable failure)
-            {
-                callback = null;
-                httpChannel = null;
-                noChannelFailure = failure;
+                httpChannel = _request._httpChannelState;
+                if (httpChannel != null)
+                   httpChannel.lockedStreamSendCompleted(true);
             }
 
-            if (httpChannel != null && callback != null)
-            {
-                httpChannel._writeInvoker.run(callback::succeeded);
-            }
-            else
+            if (callback != null)
             {
-                // Channel already completed, just fail the callback.
-                HttpChannelState.failed(callback, noChannelFailure);
+                if (httpChannel != null)
+                    httpChannel._writeInvoker.run(callback::succeeded);
+                else
+                    // Channel already completed, just fail the callback.
+                    HttpChannelState.failed(callback, new IllegalStateException("channel already completed"));
             }
         }
 
@@ -1357,31 +1350,23 @@ public void failed(Throwable x)
                 LOG.debug("write failed {}", this, x);
             Callback callback;
             HttpChannelState httpChannel;
-            Throwable noChannelFailure = null;
             try (AutoLock ignored = _request._lock.lock())
             {
                 _writeFailure = x;
                 callback = _writeCallback;
                 _writeCallback = null;
-                httpChannel = _request.lockedGetHttpChannelState();
-                httpChannel.lockedStreamSendCompleted(false);
-            }
-            catch (Throwable failure)
-            {
-                callback = null;
-                httpChannel = null;
-                noChannelFailure = failure;
+                httpChannel = _request._httpChannelState;
+                if (httpChannel != null)
+                    httpChannel.lockedStreamSendCompleted(false);
             }
 
-            if (httpChannel != null && callback != null)
-            {
-                Callback finalCallback = callback;
-                httpChannel._writeInvoker.run(() -> HttpChannelState.failed(finalCallback, x));
-            }
-            else
+            if (callback != null)
             {
-                // Channel already completed, just fail the callback.
-                HttpChannelState.failed(callback, noChannelFailure);
+                if (httpChannel != null)
+                    httpChannel._writeInvoker.run(() -> HttpChannelState.failed(callback, x));
+                else
+                    // Channel already completed, just fail the callback.
+                    HttpChannelState.failed(callback, ExceptionUtil.combine(x, new IllegalStateException("channel already completed")));
             }
         }