diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java index 55cfb7ab063..3e69c185f75 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java @@ -88,7 +88,7 @@ public class HttpChannelOverHTTP extends HttpChannel @Override public void release() { - connection.release(this); + connection.release(); } @Override diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java index 7e3cadb0d86..2e344c3c840 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java @@ -169,11 +169,10 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec return receiver.onUpgradeFrom(); } - public void release(HttpChannelOverHTTP channel) + public void release() { // Restore idle timeout getEndPoint().setIdleTimeout(idleTimeout); - channel.destroy(); getHttpDestination().release(this); } @@ -188,9 +187,8 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec if (closed.compareAndSet(false, true)) { getHttpDestination().close(this); - abort(failure); - + channel.destroy(); getEndPoint().shutdownOutput(); if (LOG.isDebugEnabled()) LOG.debug("Shutdown {}", this);