8313356: Improve address selection in sun.net.NetworkClient

cushon · Jul 28, 2023 · b1f1993 · b1f1993
1 parent 402cb6a
commit b1f1993
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/java.base/share/classes/sun/net/NetworkClient.java b/src/java.base/share/classes/sun/net/NetworkClient.java
@@ -150,6 +150,23 @@ public void openServer(String server, int port)
      * appropriate options pre-established
      */
     protected Socket doConnect (String server, int port)
+    throws IOException, UnknownHostException {
+        IOException exception = null;
+        for (InetAddress address : InetAddress.getAllByName(server)) {
+            try {
+                return doConnect(address, port);
+            } catch (IOException e) {
+                if (exception == null) {
+                    exception = e;
+                } else {
+                    exception.addSuppressed(e);
+                }
+            }
+        }
+        throw exception;
+    }
+
+    private Socket doConnect (InetAddress server, int port)
     throws IOException, UnknownHostException {
         Socket s;
         if (proxy != null) {