ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev

Browse Source
This commit is contained in:
Looly 2020-12-17 00:21:47 +08:00
commit 89300c5f4d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java
View File

@ -3194,7 +3194,7 @@ public class FileUtil extends PathUtil {
public static boolean isSub(File parent, File sub) {
Assert.notNull(parent);
Assert.notNull(sub);
return sub.toPath().startsWith(parent.toPath());
return sub.toPath().toAbsolutePath().normalize().startsWith(parent.toPath().toAbsolutePath().normalize());
}
/**

7
hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
View File

@ -384,4 +384,11 @@ public class FileUtilTest {
File file2 = new File("d:/test2/aaa");
Assert.assertFalse(FileUtil.isSub(file, file2));
}
@Test
public void isSubRelativeTest() {
File file = new File("..");
File file2 = new File(".");
Assert.assertTrue(FileUtil.isSub(file, file2));
}
}