Propagate requestType through jdisc core response

2 files changed, 6 insertions, 7 deletions

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
index eeae1fa74bc..a3cb31d5ecb 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
@@ -28,7 +28,7 @@ public class HttpRequestTestCase {
 
     @Test
     public void requireThatSimpleServerConstructorsUseReasonableDefaults() {
-        final URI uri = URI.create("http://localhost/");
+        URI uri = URI.create("http://localhost/");
         HttpRequest request = HttpRequest.newServerRequest(mockContainer(), uri);
         assertTrue(request.isServerRequest());
         assertEquals(uri, request.getUri());
@@ -50,9 +50,9 @@ public class HttpRequestTestCase {
 
     @Test
     public void requireThatSimpleClientConstructorsUseReasonableDefaults() {
-        final Request parent = new Request(mockContainer(), URI.create("http://localhost/"));
+        Request parent = new Request(mockContainer(), URI.create("http://localhost/"));
 
-        final URI uri = URI.create("http://remotehost/");
+        URI uri = URI.create("http://remotehost/");
         HttpRequest request = HttpRequest.newClientRequest(parent, uri);
         assertFalse(request.isServerRequest());
         assertEquals(uri, request.getUri());
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 c1512c04d2b..d2f74a56c80 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
@@ -1028,10 +1028,9 @@ public class HttpServerTest {
 
         @Override
         public ContentChannel handleRequest(Request request, ResponseHandler handler) {
-            ContentChannel channel = ResponseDispatch.newInstance(Response.Status.OK).connect(handler);
-            if (requestType != null)
-                request.setRequestType(requestType);
-            return channel;
+            Response response = new Response(OK);
+            response.setRequestType(requestType);
+            return handler.handleResponse(response);
         }
     }