diff options
4 files changed, 15 insertions, 15 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java index 6132a5c40ad..fe75e118fb3 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Response.java @@ -215,6 +215,6 @@ public class Response { * @param handler The handler to pass the timeout {@link Response} to. */ public static void dispatchTimeout(ResponseHandler handler) { - ResponseDispatch.newInstance(Status.REQUEST_TIMEOUT).dispatch(handler); + ResponseDispatch.newInstance(Status.GATEWAY_TIMEOUT).dispatch(handler); } } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java index 46464a9b05a..0a7d5c6b0f8 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java @@ -82,8 +82,8 @@ public class TimeoutManagerImplTestCase { @Test public void requireThatNullRequestContentCanTimeout() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newNullContent()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @@ -96,31 +96,31 @@ public class TimeoutManagerImplTestCase { } catch (RequestDeniedException e) { } - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseDenied() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newResponseDenied())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newResponseDenied())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseThrowsException() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newThrowException())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newThrowException())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseInterruptsThread() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInterruptThread())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInterruptThread())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @@ -154,7 +154,7 @@ public class TimeoutManagerImplTestCase { @Test public void requireThatResponseHandlerIsWellBehavedAfterTimeout() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); ContentChannel content = ctx.requestHandler.responseHandler.handleResponse(new Response(Response.Status.OK)); assertNotNull(content); @@ -246,7 +246,7 @@ public class TimeoutManagerImplTestCase { Response response = responseHandler.response.get(); assertNotNull(response); - assertEquals(Response.Status.REQUEST_TIMEOUT, response.getStatus()); + assertEquals(Response.Status.GATEWAY_TIMEOUT, response.getStatus()); assertTrue(ctx.close()); } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java index 661165ac5e8..47f3fd122fa 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java @@ -40,7 +40,7 @@ public class AbstractRequestHandlerTestCase { }.handleTimeout(NonWorkingRequest.newInstance("http://localhost/"), handler); Response response = handler.get(600, TimeUnit.SECONDS); assertNotNull(response); - assertEquals(Response.Status.REQUEST_TIMEOUT, response.getStatus()); + assertEquals(Response.Status.GATEWAY_TIMEOUT, response.getStatus()); } @Test diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index a893a76ff52..a1a7afc1dfe 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -37,10 +37,10 @@ import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import static com.yahoo.jdisc.Response.Status.GATEWAY_TIMEOUT; import static com.yahoo.jdisc.Response.Status.INTERNAL_SERVER_ERROR; import static com.yahoo.jdisc.Response.Status.NOT_FOUND; import static com.yahoo.jdisc.Response.Status.OK; -import static com.yahoo.jdisc.Response.Status.REQUEST_TIMEOUT; import static com.yahoo.jdisc.Response.Status.REQUEST_URI_TOO_LONG; import static com.yahoo.jdisc.Response.Status.UNSUPPORTED_MEDIA_TYPE; import static com.yahoo.jdisc.http.HttpHeaders.Names.CONNECTION; @@ -365,7 +365,7 @@ public class HttpServerTest { final UnresponsiveHandler requestHandler = new UnresponsiveHandler(); final TestDriver driver = TestDrivers.newInstance(requestHandler); driver.client().get("/status.html") - .expectStatusCode(is(REQUEST_TIMEOUT)); + .expectStatusCode(is(GATEWAY_TIMEOUT)); ResponseDispatch.newInstance(OK).dispatch(requestHandler.responseHandler); assertThat(driver.close(), is(true)); } |