From 1a46b2a39e920266269a7403aa7957494d783a55 Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 6 Jul 2024 10:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DFileUtil.cleanEmpty=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E6=B8=85=E7=A9=BA=E9=80=92=E5=BD=92?= =?UTF-8?q?=E7=A9=BA=E7=9B=AE=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74c38bb0b..092c9abcd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,13 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.30(2024-07-03) +# 5.8.30(2024-07-06) ### 🐣新特性 ### 🐞Bug修复 * 【core 】 修复因RFC3986理解有误导致的UrlPath处理冒号转义问题(issue#IAAE88@Gitee) +* 【core 】 修复FileUtil.cleanEmpty无法正确清空递归空目录问题(pr#1233@Gitee) ------------------------------------------------------------------------------------------------------------- # 5.8.29(2024-07-03) diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index affd485c9..6f15d98bb 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -874,8 +874,8 @@ public class FileUtil extends PathUtil { } // 当前目录清除完毕,需要再次判断当前文件夹,空文件夹则删除之 - files = directory.listFiles(); - if (ArrayUtil.isEmpty(files)) { + String[] fileNames = directory.list(); + if (ArrayUtil.isEmpty(fileNames)) { return directory.delete(); } return true;