Save creating (and validating) a peer INET address if not required

eclipse-vertx · Nov 2, 2023 · 64297be · 64297be
1 parent 3e9d5d1
commit 64297be
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/src/main/java/io/vertx/core/net/impl/NetClientImpl.java b/src/main/java/io/vertx/core/net/impl/NetClientImpl.java
@@ -39,7 +39,6 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 
 /**
  *
@@ -294,16 +293,8 @@ private void connectInternal2(ConnectOptions connectOptions,
         }
         remoteAddress = SocketAddress.inetSocketAddress(port, host);
       }
-      String peerHost = connectOptions.getHost();
-      Integer peerPort = connectOptions.getPort();
-      if (remoteAddress.isInetSocket()) {
-        if (peerHost == null) {
-          peerHost = remoteAddress.host();;
-        }
-        if (peerPort == null) {
-          peerPort = remoteAddress.port();
-        }
-      }
+
+      SocketAddress peerAddress = peerAddress(remoteAddress, connectOptions);
 
       vertx.transport().configure(options, remoteAddress.isDomainSocket(), bootstrap);
 
@@ -321,7 +312,7 @@ private void connectInternal2(ConnectOptions connectOptions,
         .proxyOptions(proxyOptions);
 
       SocketAddress captured = remoteAddress;
-      SocketAddress peerAddress = peerHost != null && peerPort != null ? SocketAddress.inetSocketAddress(peerPort, peerHost) : null;
+
       channelProvider.handler(ch -> connected(
         context,
         sslOptions,
@@ -365,6 +356,26 @@ private void connectInternal2(ConnectOptions connectOptions,
     }
   }
 
+  private static SocketAddress peerAddress(SocketAddress remoteAddress, ConnectOptions connectOptions) {
+    if (!connectOptions.isSsl()) {
+      return null;
+    }
+    String peerHost = connectOptions.getHost();
+    Integer peerPort = connectOptions.getPort();
+    if (remoteAddress.isInetSocket()) {
+      if (peerHost == null && peerPort == null) {
+        return remoteAddress;
+      }
+      if (peerHost == null) {
+        peerHost = remoteAddress.host();;
+      }
+      if (peerPort == null) {
+        peerPort = remoteAddress.port();
+      }
+    }
+    return peerHost != null && peerPort != null ? SocketAddress.inetSocketAddress(peerPort, peerHost) : null;
+  }
+
   private void connected(ContextInternal context,
                          ClientSSLOptions sslOptions,
                          Channel ch,