diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-09-04 09:47:40 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-09-04 09:54:15 +0200 |
| commit | 1455e8ea5cfd117cc9170f63116159d06e16adad (patch) | |
| tree | 2cb6e773d7f2b9c3a6e7c63f098f9b17237f8125 | |
| parent | 34f9683077f958fce2963458ce42143c66bcb88b (diff) | |
Upgrade Jetty to version 9.4.12
Announcement: http://dev.eclipse.org/mhonarc/lists/jetty-announce/msg00124.html
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index ccb8a9c311c..259fcfb8de7 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.10.v20180503</jetty.version> + <jetty.version>9.4.12.v20180830</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/HttpResponseStatisticsCollector.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java index 3a121e8b1ed..ef416fd961f 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpResponseStatisticsCollector.java @@ -203,4 +203,10 @@ public class HttpResponseStatisticsCollector extends HandlerWrapper implements G } return shutdownCb; } + + @Override + public boolean isShutdown() { + FutureCallback futureCallback = shutdown.get(); + return futureCallback != null && futureCallback.isDone(); + } } |