lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复PathMover.moveContent问题

Browse Source
This commit is contained in:
Looly 2024-06-17 10:05:29 +08:00
parent c8a1d67726
commit 69b3d4565c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,7 +2,7 @@
# 🚀Changelog
-------------------------------------------------------------------------------------------------------------
# 5.8.29(2024-06-14)
# 5.8.29(2024-06-17)
### 🐣新特性
* 【core 】 DateUtil增加offsetYear方法
@ -17,6 +17,7 @@
* 【core 】 修复VersionComparator传入空字符串报错问题（pr#3614@Github）
* 【core 】 修复CaseInsensitiveLinkedMap顺序错误问题（issue#IA4K4F@Gitee）
* 【core 】 修复DateUtil.offset空指针问题（issue#3617@Github）
* 【core 】 修复PathMover.moveContent问题（issue#IA5Q8D@Gitee）
-------------------------------------------------------------------------------------------------------------
# 5.8.28(2024-05-29)

9
hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java
View File

@ -130,19 +130,14 @@ public class PathMover {
*/
public Path moveContent() {
final Path src = this.src;
final Path target = this.target;
if (PathUtil.isExistsAndNotDirectory(target, false)) {
// 文件移动调用move方法
return move();
}
final Path target = this.target;
if (PathUtil.isExistsAndNotDirectory(target, false)) {
// 目标不能为文件
throw new IllegalArgumentException("Can not move dir content to a file");
}
// issue#2893 target 不存在导致NoSuchFileException
if (PathUtil.equals(src, target)) {
if (Files.exists(target) && PathUtil.equals(src, target)) {
// issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。
return target;
}