diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2016-12-12 10:19:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 10:19:26 +0100 |
| commit | 0fa107d2d653909c4d0368c87a11208dadf9c9cd (patch) | |
| tree | 365f3ae210752a3d9226ab5c0ec28e2a9404955e /jdisc_http_service | |
| parent | 2c752e6694bef5507625702260479e92f62eb749 (diff) | |
| parent | 354add843c6cc42404011c021387bf5729fa1164 (diff) | |
Merge pull request #1296 from yahoo/bjorncs/jetty-v9.4.0
Use Jetty 9.4.0
Diffstat (limited to 'jdisc_http_service')
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |