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 d64f3440d0..9646f51418 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
@@ -98,7 +98,7 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Web
     @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 781b5fe94c..c38b530042 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
@@ -244,10 +244,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);
     }
 
     /**