diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-04 14:27:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 14:27:02 +0200 |
| commit | 28d9bc98b9fdce4ab87ada59660b36369d934694 (patch) | |
| tree | 69c9825a4eaf84059bd07abb130a25813793b391 | |
| parent | 7c1ca7fad547776cbf23063d6a17c43d6bd12a3b (diff) | |
| parent | d52265550e72abd0a6462d80e06c40c2f4d55e52 (diff) | |
Merge pull request #6785 from vespa-engine/revert-6776-bjorncs/jetty-9.4.12
Revert "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, 1 insertions, 7 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 259fcfb8de7..ccb8a9c311c 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.12.v20180830</jetty.version> + <jetty.version>9.4.10.v20180503</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 ef416fd961f..3a121e8b1ed 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,10 +203,4 @@ public class HttpResponseStatisticsCollector extends HandlerWrapper implements G } return shutdownCb; } - - @Override - public boolean isShutdown() { - FutureCallback futureCallback = shutdown.get(); - return futureCallback != null && futureCallback.isDone(); - } } |