diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 22:39:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 22:39:44 +0100 |
| commit | a071c54f33582ba1e2bd13cc62c3549d225a7c68 (patch) | |
| tree | 3c97010cd2d2bb923a1466386d16f056d7c7c7e7 /jdisc_http_service | |
| parent | 8703d56ff0057049c4d61c37fe3f25b6037bcd3b (diff) | |
Revert "Use Jetty 9.4.0"
Diffstat (limited to 'jdisc_http_service')
| -rw-r--r-- | jdisc_http_service/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 9b465db836d..91e9b4336c6 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -185,7 +185,6 @@ <discPreInstallBundle> asm-debug-all-${asm-debug-all.version}.jar, javax.servlet-api-3.1.0.jar, - jetty-client-${jetty.version}.jar, jetty-continuation-${jetty.version}.jar, jetty-http-${jetty.version}.jar, jetty-io-${jetty.version}.jar, diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java index e011754f16b..6b24996e23d 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java @@ -103,7 +103,7 @@ class WebSocketRequestDispatch extends WebSocketAdapter { final Response jdiscResponse = (Response)responseRef.getAndSet(new Object()); if (jdiscResponse != null) { log.finer("Applying sync " + jdiscResponse.getStatus() + " response to websocket response."); - servletResponse.setStatusCode(jdiscResponse.getStatus()); + servletResponse.setStatus(jdiscResponse.getStatus()); WebSocketRequestFactory.copyHeaders(jdiscResponse, servletResponse); } return this; |