Upgrade Jetty to version 9.4.12.RC2

1 files changed, 10 insertions, 2 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 1f2fb40f42f..6e3b6a65c51 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -67,15 +67,23 @@ public class ConnectorFactory {
         connector.setReuseAddress(connectorConfig.reuseAddress());
         double soLingerTimeSeconds = connectorConfig.soLingerTime();
         if (soLingerTimeSeconds == -1) {
-            connector.setSoLingerTime(-1);
+            setSoLingerTime(connector, -1);
         } else {
-            connector.setSoLingerTime((int)(soLingerTimeSeconds * 1000.0));
+            setSoLingerTime(connector, (int)(soLingerTimeSeconds * 1000.0));
         }
         connector.setIdleTimeout((long)(connectorConfig.idleTimeout() * 1000.0));
         connector.setStopTimeout((long)(connectorConfig.stopTimeout() * 1000.0));
         return connector;
     }
 
+    @SuppressWarnings("deprecation")
+    private static void setSoLingerTime(ServerConnector connector, int milliseconds) {
+        // TODO: Don't use deprecated methods. Deprecate soLingerTime from connector config
+        // Jetty says: "don't use as socket close linger time has undefined behavior for non-blocking sockets"
+        // Jetty implementation is now a noop: https://github.com/eclipse/jetty.project/issues/2468, http://mail.openjdk.java.net/pipermail/nio-dev/2018-June/005195.html
+        connector.setSoLingerTime(milliseconds);
+    }
+
     private HttpConnectionFactory newHttpConnectionFactory() {
         HttpConfiguration httpConfig = new HttpConfiguration();
         httpConfig.setSendDateHeader(true);