!1233 fix bug:当前目录清除完毕,需要再次判断当前文件夹,空文件夹则删除之

Merge pull request !1233 from Earlman/v5-dev
This commit is contained in:
Looly 2024-07-06 02:33:23 +00:00 committed by Gitee
commit 46697f0fe9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -863,7 +863,7 @@ public class FileUtil extends PathUtil {
return true; return true;
} }
final File[] files = directory.listFiles(); File[] files = directory.listFiles();
if (ArrayUtil.isEmpty(files)) { if (ArrayUtil.isEmpty(files)) {
// 空文件夹则删除之 // 空文件夹则删除之
return directory.delete(); return directory.delete();
@ -872,6 +872,12 @@ public class FileUtil extends PathUtil {
for (File childFile : files) { for (File childFile : files) {
cleanEmpty(childFile); cleanEmpty(childFile);
} }
// 当前目录清除完毕需要再次判断当前文件夹空文件夹则删除之
files = directory.listFiles();
if (ArrayUtil.isEmpty(files)) {
return directory.delete();
}
return true; return true;
} }