From 753255c30c656ed1de11d185b15b8a4f007decd3 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 6 Jul 2018 15:38:00 -0400
Subject: [PATCH] Fix ThreadAffinityClientConnectionFactory

`isSingleUse()` should return `false` by default - the whole point is
to bind a connection to a thread. The TACCF should have its own flag
not return the delegate's.

Also, the `TcpReceivingChanneladapter` calls `closeConnection(connectionId)`.
This should be a no-op for the TACCF since the proper way to close a connection
is to call `releaseConnection()` on the thread to which the connection is bound.

**cherry-pick to 5.0.x**
---
 .../ThreadAffinityClientConnectionFactory.java  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactory.java
index eef7f3bd9a..1faa252d0a 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactory.java
@@ -298,21 +298,6 @@ public class ThreadAffinityClientConnectionFactory extends AbstractClientConnect
 		this.connectionFactory.setMapper(mapper);
 	}
 
-	@Override
-	public boolean isSingleUse() {
-		return this.connectionFactory.isSingleUse();
-	}
-
-	@Override
-	public void setSingleUse(boolean singleUse) {
-		this.connectionFactory.setSingleUse(singleUse);
-	}
-
-	@Override
-	public void setLeaveOpen(boolean leaveOpen) {
-		this.connectionFactory.setLeaveOpen(leaveOpen);
-	}
-
 	@Override
 	public void setInterceptorFactoryChain(TcpConnectionInterceptorFactoryChain interceptorFactoryChain) {
 		this.connectionFactory.setInterceptorFactoryChain(interceptorFactoryChain);
@@ -370,7 +355,7 @@ public class ThreadAffinityClientConnectionFactory extends AbstractClientConnect
 
 	@Override
 	public boolean closeConnection(String connectionId) {
-		return this.connectionFactory.closeConnection(connectionId);
+		return false;
 	}
 
 	@Override