diff options
author | Joakim Erdfelt | 2015-08-27 16:27:04 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2015-08-27 16:33:44 +0000 |
commit | 54e3d0a2e81935308e47c75ca75cd7a5b51d2f73 (patch) | |
tree | 20fece51d8ec25d6b5392011b62f764929e7d1f0 | |
parent | 9c855bee76188982d2b58aab90086ab22c153f02 (diff) | |
download | org.eclipse.jetty.project-54e3d0a2e81935308e47c75ca75cd7a5b51d2f73.tar.gz org.eclipse.jetty.project-54e3d0a2e81935308e47c75ca75cd7a5b51d2f73.tar.xz org.eclipse.jetty.project-54e3d0a2e81935308e47c75ca75cd7a5b51d2f73.zip |
476049 - When using WebSocket Session.close() there should be no status code or reason sent
2 files changed, 6 insertions, 2 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 cfd5323d52..568b889f0b 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 @@ -93,7 +93,7 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Inc @Override public void close() { - this.close(StatusCode.NORMAL,null); + connection.close(); } @Override diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java index c0cdfadba7..4e51713338 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java @@ -243,10 +243,14 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp return super.getExecutor(); } + /** + * Close without a close code or reason + */ @Override public void close() { - close(StatusCode.NORMAL,null); + CloseInfo close = new CloseInfo(); + this.outgoingFrame(close.asFrame(),new OnCloseLocalCallback(close),BatchMode.OFF); } /** |