Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR #11402 - changes for review 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2024-02-22 15:56:52 +11:00
parent 0ece73b769
commit 436f4f8507
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConnection.java
View File

@ -220,9 +220,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio
BufferUtil.flipToFlush(buffer, 0); BufferUtil.flipToFlush(buffer, 0);
} }
/**
* Physical connection Open.
*/
@Override @Override
public void onOpen() public void onOpen()
{ {
@ -236,11 +233,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio
fillAndParse(); fillAndParse();
} }
/**
* Physical connection disconnect.
* <p>
* Not related to WebSocket close handshake.
*/
@Override @Override
public void onClose(Throwable cause) public void onClose(Throwable cause)
{ {
@ -273,11 +265,6 @@ public class WebSocketConnection extends AbstractConnection implements Connectio
return true; 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 @Override
protected boolean onReadTimeout(TimeoutException timeout) protected boolean onReadTimeout(TimeoutException timeout)
{ {

3
jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java
View File

@ -109,7 +109,6 @@ public class ExplicitDemandTest
if (frame.getOpCode() == OpCode.TEXT) if (frame.getOpCode() == OpCode.TEXT)
textMessages.add(BufferUtil.toString(frame.getPayload())); textMessages.add(BufferUtil.toString(frame.getPayload()));
callback.succeed(); callback.succeed();
} }
} }
@ -265,7 +264,7 @@ public class ExplicitDemandTest
Session session = connect.get(5, TimeUnit.SECONDS); Session session = connect.get(5, TimeUnit.SECONDS);
session.sendText("test-text", Callback.NOOP); 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)); assertNull(onOpenSocket.textMessages.poll(1, TimeUnit.SECONDS));
// Once we leave onOpen we receive the message. // Once we leave onOpen we receive the message.