diff --git a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServer.java b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServer.java index 1b665bded92..89fc8c3f31e 100644 --- a/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServer.java +++ b/jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServer.java @@ -155,7 +155,7 @@ public class BlockheadServer public void echoMessage(int expectedFrames, TimeUnit timeoutUnit, int timeoutDuration) throws IOException, TimeoutException { LOG.debug("Echo Frames [expecting {}]",expectedFrames); - IncomingFramesCapture cap = readFrames(expectedFrames,timeoutUnit,timeoutDuration); + IncomingFramesCapture cap = readFrames(expectedFrames,timeoutDuration,timeoutUnit); // now echo them back. for (Frame frame : cap.getFrames()) { @@ -329,15 +329,6 @@ public class BlockheadServer return len; } - /** - * @deprecated use {@link #readFrames(int, int, TimeUnit)} for correct parameter order - */ - @Deprecated - public IncomingFramesCapture readFrames(int expectedCount, TimeUnit timeoutUnit, int timeoutDuration) throws IOException, TimeoutException - { - return readFrames(expectedCount,timeoutDuration,timeoutUnit); - } - public IncomingFramesCapture readFrames(int expectedCount, int timeoutDuration, TimeUnit timeoutUnit) throws IOException, TimeoutException { LOG.debug("Read: waiting for {} frame(s) from client",expectedCount);