#12520 proper fix?

Signed-off-by: Ludovic Orban <[email protected]>
jetty · Nov 18, 2024 · df920ec · df920ec
1 parent d6abf80
commit df920ec
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java
@@ -363,12 +363,14 @@ Boolean abort(Throwable failure)
             {
                 boolean handle = _state == State.WAITING;
                 if (handle)
+                {
                     _state = State.WOKEN;
-                // XXX changing the RequestState to COMPLETED *and* returning true here
-                //  means completed(Throwable failure) will be called by the redispatching
-                //  and the latter will throw on its _requestState check as it wants it
-                //  to be COMPLETING.
-                _requestState = RequestState.COMPLETED;
+                    _requestState = RequestState.COMPLETING;
+                }
+                else
+                {
+                    _requestState = RequestState.COMPLETED;
+                }
                 return handle;
             }
             return null;
@@ -1025,7 +1027,7 @@ protected void completed(Throwable failure)
                 LOG.debug("completed {}", toStringLocked());
 
             if (_requestState != RequestState.COMPLETING)
-                return; // Already completed, possibly by abort().
+                throw new IllegalStateException(this.getStatusStringLocked());
 
             if (_event == null)
             {