From d84d033df85426491d62eae282b03fb1687ae530 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 15 Aug 2024 18:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DZipUtil=E5=8E=8B=E7=BC=A9?= =?UTF-8?q?=E6=88=90=E6=B5=81=E7=9A=84=E6=96=B9=E6=B3=95=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/compress/ZipWriter.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16cf14c61..22d6a69e7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ ### 🐞Bug修复 * 【http 】 修复getFileNameFromDisposition不符合规范问题（issue#IAKBPD@Gitee） -* 【crypto 】 修复SymmetricCrypto.setParams和setRandom没有加锁问题（issue#IAJIY3@Github） +* 【crypto 】 修复SymmetricCrypto.setParams和setRandom没有加锁问题（issue#IAJIY3@Gitee） +* 【crypto 】 修复ZipUtil压缩成流的方法检查文件时报错问题（issue#3697@Github） ------------------------------------------------------------------------------------------------------------- # 5.8.31(2024-08-12) diff --git a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java index ff724b747..c7aad381d 100755 --- a/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/cn/hutool/core/compress/ZipWriter.java @@ -24,6 +24,7 @@ import java.util.zip.ZipOutputStream; * @author looly * @since 5.7.8 */ +@SuppressWarnings("resource") public class ZipWriter implements Closeable { /** @@ -257,7 +258,7 @@ public class ZipWriter implements Closeable { } } else { // issue#IAGYDG 检查加入的文件是否为压缩结果文件本身，避免死循环 - if (FileUtil.equals(file, zipFile)) { + if (null != this.zipFile && FileUtil.equals(file, zipFile)) { return this; }