Issue #6661 - Make ServerConnector socket options setting optional

jetty · Aug 24, 2021 · 54edcef · 54edcef
1 parent ec84207
commit 54edcef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnector.java
@@ -486,7 +486,7 @@ private <T> void setSocketOption(SocketChannel channel, SocketOption<T> option,
         catch (Throwable x)
         {
             if (LOG.isDebugEnabled())
-                LOG.debug("Could not configure {} to {} on {}", option, value, channel);
+                LOG.debug("Could not configure {} to {} on {}", option, value, channel, x);
         }
     }
 

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
@@ -349,15 +349,16 @@ protected ServerSocketChannel openAcceptChannel() throws IOException
         return serverChannel;
     }
 
-    private <T> void setSocketOption(ServerSocketChannel channel, SocketOption<T> name, T value)
+    private <T> void setSocketOption(ServerSocketChannel channel, SocketOption<T> option, T value)
     {
         try
         {
-            channel.setOption(name, value);
+            channel.setOption(option, value);
         }
-        catch (Throwable t)
+        catch (Throwable x)
         {
-            LOG.warn("Unable to set socket option {} to {}", name, value, t);
+            if (LOG.isDebugEnabled())
+                LOG.debug("Could not configure {} to {} on {}", option, value, channel, x);
         }
     }