diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-12-10 15:06:16 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-12-12 15:45:38 +0100 |
| commit | bc633ff379543495db64d8135b07e1564d54acfa (patch) | |
| tree | 86715e70dd2864d1247740d18416d2d628e023a8 /jdisc_http_service | |
| parent | 3725cd424458081ee336495cf3245851a238d5c1 (diff) | |
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, 2 insertions, 1 deletions
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml index 91e9b4336c6..9b465db836d 100644 --- a/jdisc_http_service/pom.xml +++ b/jdisc_http_service/pom.xml @@ -185,6 +185,7 @@ <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 6b24996e23d..e011754f16b 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.setStatus(jdiscResponse.getStatus()); + servletResponse.setStatusCode(jdiscResponse.getStatus()); WebSocketRequestFactory.copyHeaders(jdiscResponse, servletResponse); } return this; |