summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-03-02 14:56:01 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-03-02 14:56:01 +0100
commitef0352897637ff290a8ce5d9e4ddeabd776bac79 (patch)
treec06765717900b7a58e6ccf58993bd1d89281a7a8 /jdisc_http_service
parentd95edfd1d1e83ba2e3654355ec574f9a1b99bb6b (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 36464eba492..4640b77590a 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
@@ -467,7 +467,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentCloseNondeterministicException() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}