diff options
| author | Joakim Erdfelt | 2015-12-17 23:15:49 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-12-17 23:15:49 +0000 |
| commit | 88945478f71ad408e57e179257c2476d6cdb19f8 (patch) | |
| tree | d1b363161b05979c8c791b44f33d230da60998de /jetty-websocket | |
| parent | 9908910c3b663e08d618722597f8a8d0d23e970c (diff) | |
| parent | 1543601968a6901717a9a403c4894a4280ffcc2f (diff) | |
| download | org.eclipse.jetty.project-88945478f71ad408e57e179257c2476d6cdb19f8.tar.gz org.eclipse.jetty.project-88945478f71ad408e57e179257c2476d6cdb19f8.tar.xz org.eclipse.jetty.project-88945478f71ad408e57e179257c2476d6cdb19f8.zip | |
Merge branch 'jetty-9.2.x' into jetty-9.3.x
Diffstat (limited to 'jetty-websocket')
| -rw-r--r-- | jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 7e4bb330c4..394b8de7c4 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 @@ -103,7 +103,8 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Web @Override public void close() { - connection.close(); + /* This is assumed to always be a NORMAL closure, no reason phrase */ + connection.close(StatusCode.NORMAL, null); } @Override |