summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-04 11:29:49 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-04 13:24:45 +0100
commit6aecffc6e96b3141a4051ee6b8ec4b90fa7ce6c6 (patch)
tree4ac55fe3948ec55deb6bb49067f4c6cfee00bc98 /jdisc_http_service
parent8e97d41a730d82e89a39d46f939e5ad976349deb (diff)
Revert "Call AsyncContext.complete() when response is completed"
This reverts commit c585b50ed6ae14dd4f551547c9ff0179be70d316.
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index dede4bece9f..9e15f45b046 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
@@ -89,7 +89,7 @@ class HttpRequestDispatch {
onError(servletResponseController.finishedFuture(),
servletRequestReader::onError);
- servletResponseController.finishedFuture()
+ CompletableFuture.allOf(servletRequestReader.finishedFuture, servletResponseController.finishedFuture())
.whenComplete(completeRequestCallback);
} catch (Throwable throwable) {
log.log(Level.WARNING, "Failed registering finished listeners.", throwable);