summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-04-27 18:01:30 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-04-27 18:01:30 +0200
commit8cdf5f91f47d7be41e3c39b360848ae21878744a (patch)
treeb950d28549c3cc56df0ef517bd41d197f975c93e
parentce388205e5323a2c94c4ea20b4c208487e3ad983 (diff)
Invoke graceful shutdown with using `shutdown()`
-rw-r--r--container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index 4cdbab5f89b..f9a2e3bc1a6 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
@@ -17,14 +17,11 @@ import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.http2.HTTP2Session;
-import org.eclipse.jetty.http2.frames.GoAwayFrame;
import org.eclipse.jetty.http2.server.HTTP2ServerConnection;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.util.Callback;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -182,7 +179,7 @@ class HttpRequestDispatch {
// Graceful shutdown implies a GOAWAY frame with 'Error Code' = 'NO_ERROR' and 'Last-Stream-ID' = 2^31-1.
// In-flight requests will be allowed to complete before connection is terminated.
// See https://datatracker.ietf.org/doc/html/rfc9113#name-goaway for details
- ((HTTP2Session)http2.getSession()).goAway(GoAwayFrame.GRACEFUL, Callback.NOOP);
+ http2.getSession().shutdown();
}
}