summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-06-09 17:18:33 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-06-09 17:18:33 +0200
commitf1955d63ab782834504aee7567665fa389de01e0 (patch)
tree6f7e5c72c86150ec37c7f1388236317974dc421d
parent8cec7dcc18f268a647cfb5958f62dda864adba1f (diff)
Allow 200 response without content
There is a window between the response is committed (headers including response code is set) and the response body is written, where the exception from the request handler can be catched. If that happens, the output stream will be closed before response body is written.
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index bc4ab071432..fd220bbce49 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -440,7 +440,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentCloseWithNondeterministicAsyncFailure() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}