From 7ff28611687bbfea69527ea07fac06ab1da915dc Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 5 Oct 2011 17:41:15 -0400 Subject: [PATCH] INT-2168 Reinstate Port in Tcp Connection Id Port was always zero; broken by INT-1822. --- .../integration/ip/tcp/connection/AbstractTcpConnection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java index c2fc6cdee1..8541234206 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java @@ -71,8 +71,6 @@ public abstract class AbstractTcpConnection implements TcpConnection { private volatile String hostAddress = "unknown"; - private volatile int port; - public AbstractTcpConnection(Socket socket, boolean server, boolean lookupHost) { this.server = server; InetAddress inetAddress = socket.getInetAddress(); @@ -84,7 +82,8 @@ public abstract class AbstractTcpConnection implements TcpConnection { this.hostName = this.hostAddress; } } - this.connectionId = this.hostName + ":" + this.port + ":" + UUID.randomUUID().toString(); + int port = socket.getPort(); + this.connectionId = this.hostName + ":" + port + ":" + UUID.randomUUID().toString(); try { this.soLinger = socket.getSoLinger(); } catch (SocketException e) { }