diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java index 97d0831e4def..be55b565886a 100644 --- a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java +++ b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeoutException; import org.eclipse.jetty.util.Callback; @@ -90,47 +89,6 @@ protected Executor getExecutor() return _executor; } - protected void failedCallback(final Callback callback, final Throwable x) - { - Runnable failCallback = () -> - { - try - { - callback.failed(x); - } - catch (Exception e) - { - LOG.warn("Failed callback", x); - } - }; - - switch (Invocable.getInvocationType(callback)) - { - case BLOCKING: - try - { - getExecutor().execute(failCallback); - } - catch (RejectedExecutionException e) - { - LOG.debug("Rejected", e); - callback.failed(x); - } - break; - - case NON_BLOCKING: - failCallback.run(); - break; - - case EITHER: - Invocable.invokeNonBlocking(failCallback); - break; - - default: - throw new IllegalStateException(); - } - } - /** *
Utility method to be called to register read interest.
*After a call to this method, {@link #onFillable()} or {@link #onFillInterestedFailed(Throwable)} diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java index eade41378993..4e4ffba3a96c 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java @@ -931,7 +931,7 @@ protected void onCompleteSuccess() public void onFailure(final Throwable x) { Callback callback = resetCallback(); - failedCallback(callback, x); + callback.failed(x); } @Override