From d544dde3c028ecfc2426f01f004223887490ceae Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Thu, 7 May 2020 15:52:16 +0800
Subject: [PATCH] fix ftp bug

---
 CHANGELOG.md                                            | 1 +
 hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4839b2267..5633ce1cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### 新特性
 
 ### Bug修复
+* 【extra  】     修复Ftp设置超时问题
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
index e1ec874e6..3cdb4d991 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
@@ -13,7 +13,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.SocketException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
@@ -156,14 +155,10 @@ public class Ftp extends AbstractFtp {
 		final FTPClient client = new FTPClient();
 		client.setControlEncoding(config.getCharset().toString());
 		client.setConnectTimeout((int) config.getConnectionTimeout());
-		try {
-			client.setSoTimeout((int)config.getSoTimeout());
-		} catch (SocketException e) {
-			//ignore
-		}
 		try {
 			// 连接ftp服务器
 			client.connect(config.getHost(), config.getPort());
+			client.setSoTimeout((int)config.getSoTimeout());
 			// 登录ftp服务器
 			client.login(config.getUser(), config.getPassword());
 		} catch (IOException e) {