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-10 15:13:16 +0100 |
| commit | 354add843c6cc42404011c021387bf5729fa1164 (patch) | |
| tree | 1c0563d4a49d9e8f383b3f42111991a8f5fb3130 | |
| parent | f0b529841383c7fc24fbb6ed84ab0c1b57a88a9d (diff) | |
Use Jetty 9.4.0
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/WebSocketRequestDispatch.java | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
2 files changed, 2 insertions, 2 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; @@ -1083,7 +1083,7 @@ <curator.version>2.9.1</curator.version> <jackson2.version>2.8.3</jackson2.version> <jersey2.version>2.23.2</jersey2.version> - <jetty.version>9.3.14.v20161028</jetty.version> + <jetty.version>9.4.0.v20161208</jetty.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <test.hide>true</test.hide> <doclint>all</doclint> |