Skip to content

Commit b080664

Browse files
ogolbergacogoluegnes
authored andcommitted
Preserve original hostname in ResolvedInetAddress so that we can pass it into createSslEngine in NIO mode
(cherry picked from commit d3681d4)
1 parent c682361 commit b080664

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/main/java/com/rabbitmq/client/DnsRecordIpAddressResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public List<Address> getAddresses() throws UnknownHostException {
7474

7575
List<Address> addresses = new ArrayList<>();
7676
for (InetAddress inetAddress : inetAddresses) {
77-
addresses.add(new ResolvedInetAddress(inetAddress, portNumber));
77+
addresses.add(new ResolvedInetAddress(hostName, inetAddress, portNumber));
7878
}
7979
return addresses;
8080
}

src/main/java/com/rabbitmq/client/ResolvedInetAddress.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
public class ResolvedInetAddress extends Address {
77
private final InetAddress inetAddress;
88

9-
public ResolvedInetAddress(InetAddress inetAddress, int port) {
10-
super(inetAddress.getHostAddress(), port);
9+
public ResolvedInetAddress(String originalHostname, InetAddress inetAddress, int port) {
10+
super(originalHostname, port);
1111
this.inetAddress = inetAddress;
1212
}
1313

14-
public ResolvedInetAddress(InetAddress inetAddress) {
15-
super(inetAddress.getHostAddress());
14+
public ResolvedInetAddress(String originalHostname, InetAddress inetAddress) {
15+
super(originalHostname);
1616
this.inetAddress = inetAddress;
1717
}
1818

src/main/java/com/rabbitmq/client/impl/SocketFrameHandlerFactory.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717

1818
import com.rabbitmq.client.Address;
1919
import com.rabbitmq.client.ConnectionFactory;
20-
import com.rabbitmq.client.ResolvedInetAddress;
2120
import com.rabbitmq.client.SocketConfigurator;
2221
import com.rabbitmq.client.SslContextFactory;
2322

2423
import javax.net.SocketFactory;
2524
import java.io.IOException;
26-
import java.net.InetSocketAddress;
2725
import java.net.Socket;
2826
import java.util.concurrent.ExecutorService;
2927

0 commit comments

Comments
 (0)