diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java index a0cd8491524..adf299c9519 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java +++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java @@ -220,9 +220,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio BufferUtil.flipToFlush(buffer, 0); } - /** - * Physical connection Open. - */ @Override public void onOpen() { @@ -236,11 +233,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio fillAndParse(); } - /** - * Physical connection disconnect. - *

- * Not related to WebSocket close handshake. - */ @Override public void onClose(Throwable cause) { @@ -273,11 +265,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio return true; } - /** - * Event for no activity on connection (read or write) - * - * @return true to signal that the endpoint must be closed, false to keep the endpoint open - */ @Override protected boolean onReadTimeout(TimeoutException timeout) { diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java index 182cf79d354..2994945b7c9 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java +++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java @@ -109,7 +109,6 @@ public class ExplicitDemandTest if (frame.getOpCode() == OpCode.TEXT) textMessages.add(BufferUtil.toString(frame.getPayload())); callback.succeed(); - } } @@ -265,7 +264,7 @@ public class ExplicitDemandTest Session session = connect.get(5, TimeUnit.SECONDS); session.sendText("test-text", Callback.NOOP); - // We cannot receive messages in onOpen even if we have demanded. + // We cannot receive messages while in onOpen, even if we have demanded. assertNull(onOpenSocket.textMessages.poll(1, TimeUnit.SECONDS)); // Once we leave onOpen we receive the message.