Issue #5121 - always use isDebugEnabled() check before debug logging …

…in WebSocket Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Aug 6, 2020 · e42b41a · e42b41a
1 parent 4d42069
commit e42b41a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...t/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/...t/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
@@ -351,7 +351,8 @@ public void outgoingFrame(Frame frame, WriteCallback callback, BatchMode batchMo
             }
             catch (Throwable x)
             {
-                LOG.debug("Exception while notifying failure of callback " + callback, x);
+                if (LOG.isDebugEnabled())
+                    LOG.debug("Exception while notifying failure of callback " + callback, x);
             }
             return;
         }

diff --git a/...va/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java b/...va/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtension.java
@@ -105,7 +105,8 @@ protected void nextIncomingFrame(Frame frame)
     {
         if (frame.isFin() && !incomingContextTakeover)
         {
-            LOG.debug("Incoming Context Reset");
+            if (LOG.isDebugEnabled())
+                LOG.debug("Incoming Context Reset");
             decompressCount.set(0);
             getInflater().reset();
         }
@@ -117,7 +118,8 @@ protected void nextOutgoingFrame(Frame frame, WriteCallback callback, BatchMode
     {
         if (frame.isFin() && !outgoingContextTakeover)
         {
-            LOG.debug("Outgoing Context Reset");
+            if (LOG.isDebugEnabled())
+                LOG.debug("Outgoing Context Reset");
             getDeflater().reset();
         }
         super.nextOutgoingFrame(frame, callback, batchMode);
@@ -188,7 +190,8 @@ public void setConfig(final ExtensionConfig config)
             }
         }
 
-        LOG.debug("config: outgoingContextTakeover={}, incomingContextTakeover={} : {}", outgoingContextTakeover, incomingContextTakeover, this);
+        if (LOG.isDebugEnabled())
+            LOG.debug("config: outgoingContextTakeover={}, incomingContextTakeover={} : {}", outgoingContextTakeover, incomingContextTakeover, this);
 
         super.setConfig(configNegotiated);
     }

diff --git a/...ocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java b/...ocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilter.java
@@ -200,7 +200,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         if (configuration == null)
         {
             // no configuration, cannot operate
-            LOG.debug("WebSocketUpgradeFilter is not operational - missing " + NativeWebSocketConfiguration.class.getName());
+            if (LOG.isDebugEnabled())
+                LOG.debug("WebSocketUpgradeFilter is not operational - missing " + NativeWebSocketConfiguration.class.getName());
             chain.doFilter(request, response);
             return;
         }
@@ -210,7 +211,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         if (factory == null)
         {
             // no factory, cannot operate
-            LOG.debug("WebSocketUpgradeFilter is not operational - no WebSocketServletFactory configured");
+            if (LOG.isDebugEnabled())
+                LOG.debug("WebSocketUpgradeFilter is not operational - no WebSocketServletFactory configured");
             chain.doFilter(request, response);
             return;
         }