This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new cc3d9e7b0e Revert unwanted change cc3d9e7b0e is described below commit cc3d9e7b0e2b48f6999cf5ed303877477f65763e Author: remm <r...@apache.org> AuthorDate: Fri Mar 21 21:57:06 2025 +0100 Revert unwanted change --- java/jakarta/websocket/PongMessage.java | 2 +- java/org/apache/tomcat/websocket/WsPongMessage.java | 5 +++++ test/org/apache/tomcat/websocket/TestWsPingPongMessages.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/jakarta/websocket/PongMessage.java b/java/jakarta/websocket/PongMessage.java index 86459fbeac..ae77048fb5 100644 --- a/java/jakarta/websocket/PongMessage.java +++ b/java/jakarta/websocket/PongMessage.java @@ -28,5 +28,5 @@ public interface PongMessage { * * @return The payload of the Pong message. */ - ByteBuffer applicationData(); + ByteBuffer getApplicationData(); } diff --git a/java/org/apache/tomcat/websocket/WsPongMessage.java b/java/org/apache/tomcat/websocket/WsPongMessage.java index 76fa4ef1ff..6af05af59f 100644 --- a/java/org/apache/tomcat/websocket/WsPongMessage.java +++ b/java/org/apache/tomcat/websocket/WsPongMessage.java @@ -26,4 +26,9 @@ public record WsPongMessage(ByteBuffer applicationData) implements PongMessage { applicationData.get(dst); this.applicationData = ByteBuffer.wrap(dst); } + + @Override + public ByteBuffer getApplicationData() { + return applicationData; + } } diff --git a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java index 4b56322e21..ef907969ee 100644 --- a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java +++ b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java @@ -70,7 +70,7 @@ public class TestWsPingPongMessages extends WebSocketBaseTest { boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS); Assert.assertTrue(latchResult); - Assert.assertArrayEquals(applicationData.array(), (handler.getMessages().peek()).applicationData().array()); + Assert.assertArrayEquals(applicationData.array(), (handler.getMessages().peek()).getApplicationData().array()); } public static class PongMessageHandler extends TesterMessageCountClient.BasicHandler<PongMessage> { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org