Fix #5794 Close socket on bind failure

Update fix with IO.close()
jetty · Dec 14, 2020 · 420093e · 420093e
1 parent f2e8706
commit 420093e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
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
@@ -336,12 +336,11 @@ protected ServerSocketChannel openAcceptChannel() throws IOException
 
         if (serverChannel == null)
         {
-            serverChannel = ServerSocketChannel.open();
-
             InetSocketAddress bindAddress = getHost() == null ? new InetSocketAddress(getPort()) : new InetSocketAddress(getHost(), getPort());
-            serverChannel.socket().setReuseAddress(getReuseAddress());
+            serverChannel = ServerSocketChannel.open();
             try
             {
+                serverChannel.socket().setReuseAddress(getReuseAddress());
                 serverChannel.socket().bind(bindAddress, getAcceptQueueSize());
             }
             catch (Throwable e)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
@@ -271,9 +271,9 @@ private ServerSocket listen()
         try
         {
             ServerSocket serverSocket = new ServerSocket();
-            serverSocket.setReuseAddress(true);
             try
             {
+                serverSocket.setReuseAddress(true);
                 serverSocket.bind(new InetSocketAddress(InetAddress.getByName(host), port));
             }
             catch (Throwable e)