From c4e29fd6d8cafb3684bcc6ac2794b46fb08e3413 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 29 Sep 2016 10:00:25 -0400
Subject: [PATCH] INT-4128: FTP ControlEncoding Fix

JIRA: https://jira.spring.io/browse/INT-4128

Resolves #1915
---
 .../integration/ftp/session/AbstractFtpSessionFactory.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
index e1765764b2..2890f020f9 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java
@@ -186,6 +186,7 @@ public abstract class AbstractFtpSessionFactory<T extends FTPClient> implements
 		if (this.dataTimeout != null) {
 			client.setDataTimeout(this.dataTimeout);
 		}
+		client.setControlEncoding(this.controlEncoding);
 
 		this.postProcessClientBeforeConnect(client);
 
@@ -209,7 +210,6 @@ public abstract class AbstractFtpSessionFactory<T extends FTPClient> implements
 		this.updateClientMode(client);
 		client.setFileType(fileType);
 		client.setBufferSize(bufferSize);
-		client.setControlEncoding(controlEncoding);
 		return client;
 	}