This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 62ff43ab9380d885e4900df97edc6cff2d483a39 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Feb 18 14:50:00 2022 +0000 s --- .../tomcat/websocket/TestWebSocketFrameClient.java | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java index 49f7597..0ad0dcb 100644 --- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java +++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.Queue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.LogManager; import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig.Configurator; @@ -120,20 +118,11 @@ public class TestWebSocketFrameClient extends WebSocketBaseTest { tomcat.start(); - LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL); - LogManager.getLogManager().getLogger("org.apache.tomcat.websocket").setLevel(Level.ALL); - LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.ALL); - try { - echoTester("",null); - echoTester("/",null); - // This will trigger a redirect so there will be 5 requests logged - echoTester("/foo",null); - echoTester("/foo/",null); - } finally { - LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO); - LogManager.getLogManager().getLogger("org.apache.tomcat.websocket.WsWebSocketContainer").setLevel(Level.INFO); - LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.INFO); - } + echoTester("",null); + echoTester("/",null); + // This will trigger a redirect so there will be 5 requests logged + echoTester("/foo",null); + echoTester("/foo/",null); } public void echoTester(String path, ClientEndpointConfig clientEndpointConfig) @@ -201,7 +190,6 @@ public class TestWebSocketFrameClient extends WebSocketBaseTest { clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PASSWORD, utf8Pass); echoTester(URI_PROTECTED, clientEndpointConfig); - } @Test @@ -238,7 +226,5 @@ public class TestWebSocketFrameClient extends WebSocketBaseTest { clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PASSWORD,PWD); echoTester(URI_PROTECTED, clientEndpointConfig); - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org