| commit | 80aa66b1a0dc228b83de0c46b88a5761c74a5d2e | [log] [tgz] |
|---|---|---|
| author | Joakim Erdfelt <joakim.erdfelt@gmail.com> | Thu Dec 17 16:15:30 2015 -0700 |
| committer | Joakim Erdfelt <joakim.erdfelt@gmail.com> | Thu Dec 17 16:15:30 2015 -0700 |
| tree | c3a415aee425ff2bbb64fd0be66e5c2bbfd512f1 | |
| parent | 5f27a62aae0bccb5b2630015a5d14d77d2cdf91d [diff] | |
| parent | 1543601968a6901717a9a403c4894a4280ffcc2f [diff] |
Merge branch 'jetty-9.2.x' into feature/jetty-9.2-alt-servlet-mappings
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java index e0e2c91..c923a0f 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
@@ -94,7 +94,8 @@ @Override public void close() { - connection.close(); + /* This is assumed to always be a NORMAL closure, no reason phrase */ + connection.close(StatusCode.NORMAL, null); } @Override