diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-04 14:15:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 14:15:38 +0200 |
| commit | 7c1ca7fad547776cbf23063d6a17c43d6bd12a3b (patch) | |
| tree | 24bb2db6ee9231884311974ff05a08112513429c | |
| parent | f4b81d662c31f25b2be8964fd22bacf11b60e362 (diff) | |
| parent | 1455e8ea5cfd117cc9170f63116159d06e16adad (diff) | |
Merge pull request #6776 from vespa-engine/bjorncs/jetty-9.4.12
Upgrade Jetty to version 9.4.12
| -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(); + } } |