diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-08-22 12:28:30 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-08-22 12:36:34 +0200 |
| commit | 3fa05b2a2f3faad1d2cf83eff211e2076b5d7c51 (patch) | |
| tree | 69efab671bd45d2dd8f45ce5b56932bd95cb98f7 | |
| parent | e1b0b455ec1a63afe47b849a2f342f25dfe60cb2 (diff) | |
Upgrade Jetty to version 9.4.12.RC2
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index e00df36f0c8..bdb6aefa10a 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -466,7 +466,7 @@ <guava.version>18.0</guava.version> <guice.version>3.0</guice.version> <jaxb.version>2.3.0</jaxb.version> - <jetty.version>9.4.11.v20180605</jetty.version> + <jetty.version>9.4.12.RC2</jetty.version> <slf4j.version>1.7.5</slf4j.version> <!-- These must be kept in sync with version used by current jersey2.version. --> 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); |