summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-29 10:35:54 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-29 10:35:54 +0200
commit5ac012be0fc90ff5283f37c850ebd07445000f40 (patch)
treef841c76afb1880d7a4ca42439a55644122499d37 /jdisc_http_service
parenta6ebf71d87365ce49077934d2f3e0c7675a5cf8e (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.
Diffstat (limited to 'jdisc_http_service')
-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 bc8f63dcdca..bc4ab071432 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
@@ -580,7 +580,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentCloseNondeterministicExceptionWithAsyncFailure() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}