From 0c5444e442b3c8eb5c3f1977de440e5545de7cd7 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 4 Dec 2024 12:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Ftp.download=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9Efalse=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=88issue#3805@Github=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d71bbe2f..fe0f37050 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### 🐣新特性 * 【poi 】 优化ExcelWriter中使用比较器writer的方法,只对第一条数据进行排序(pr#3807@Github) +* 【extra 】 优化Ftp.download,返回false抛出异常(issue#3805@Github) ### 🐞Bug修复 * 【crypto 】 修复JWTSignerUtil.createSigner中algorithmId未转换问题(issue#3806@Github) 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 9bdc9fac2..96fbd275e 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java @@ -708,9 +708,11 @@ public class Ftp extends AbstractFtp { if (null != fileNameCharset) { fileName = new String(fileName.getBytes(fileNameCharset), StandardCharsets.ISO_8859_1); } + + boolean isSuccess; try { client.setFileType(FTPClient.BINARY_FILE_TYPE); - client.retrieveFile(fileName, out); + isSuccess = client.retrieveFile(fileName, out); } catch (IOException e) { throw new IORuntimeException(e); } finally { @@ -718,6 +720,10 @@ public class Ftp extends AbstractFtp { cd(pwd); } } + + if(false == isSuccess){ + throw new FtpException("retrieveFile return false"); + } } /**