Merge pull request #4858 from lorban/jetty-10.0.x-4857-setReuseAddress

Jetty 10.0.x 4857 set reuse address
jetty · May 8, 2020 · aa52d67 · aa52d67
2 parents 0018c29 + 1d424a3
commit aa52d67
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
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
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.net.SocketException;
+import java.net.StandardSocketOptions;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
@@ -57,6 +58,7 @@ public class ClientConnector extends ContainerLifeCycle
     private Duration connectTimeout = Duration.ofSeconds(5);
     private Duration idleTimeout = Duration.ofSeconds(30);
     private SocketAddress bindAddress;
+    private boolean reuseAddress = true;
 
     public Executor getExecutor()
     {
@@ -164,6 +166,16 @@ public void setBindAddress(SocketAddress bindAddress)
         this.bindAddress = bindAddress;
     }
 
+    public boolean getReuseAddress()
+    {
+        return reuseAddress;
+    }
+
+    public void setReuseAddress(boolean reuseAddress)
+    {
+        this.reuseAddress = reuseAddress;
+    }
+
     @Override
     protected void doStart() throws Exception
     {
@@ -218,8 +230,10 @@ public void connect(SocketAddress address, Map<String, Object> context)
             SocketAddress bindAddress = getBindAddress();
             if (bindAddress != null)
             {
+                boolean reuseAddress = getReuseAddress();
                 if (LOG.isDebugEnabled())
-                    LOG.debug("Binding to {} to connect to {}", bindAddress, address);
+                    LOG.debug("Binding to {} to connect to {}{}", bindAddress, address, (reuseAddress ? " reusing address" : ""));
+                channel.setOption(StandardSocketOptions.SO_REUSEADDR, reuseAddress);
                 channel.bind(bindAddress);
             }
             configure(channel);

diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java
@@ -243,6 +243,7 @@ private ServerSocket createServerSocket(InetAddress address, int port) throws IO
             if (_sslContextFactory == null)
             {
                 ServerSocket server = new ServerSocket();
+                server.setReuseAddress(true);
                 server.bind(new InetSocketAddress(address, port));
                 return server;
             }