Skip to content

[IO-874] FileUtils.forceDelete can delete a broken symlink again #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 2 commits into from
Jul 1, 2025
Merged

[IO-874] FileUtils.forceDelete can delete a broken symlink again #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d47e7
[IO-874] FileUtils.forceDelete can delete a broken symlink again.
JoergBudi Jun 30, 2025
fc616ed
[IO-874] fix checkstyle error
JoergBudi Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/io/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public static String byteCountToDisplaySize(final Number size) {
*/
private static void checkExists(final File file, final boolean strict) throws FileNotFoundException {
Objects.requireNonNull(file, PROTOCOL_FILE);
if (strict && !file.exists()) {
if (strict && !file.exists() && !isSymlink(file)) {
throw new FileNotFoundException(file.toString());
}
}
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/org/apache/commons/io/FileUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,6 +1761,42 @@ void testForceDeleteUnwritableFile() throws Exception {
}
}

@Test
public void testForceDeleteBrokenSymlink() throws Exception {
final ImmutablePair<Path, Path> pair = createTempSymbolicLinkedRelativeDir();
final Path symlinkedDir = pair.getLeft();
final Path targetDir = pair.getRight();

Files.delete(targetDir);
assertFalse(Files.exists(symlinkedDir));
assertTrue(Files.isSymbolicLink(symlinkedDir));

FileUtils.forceDelete(symlinkedDir.toFile());

// check targeted symlink is gone
assertFalse(Files.exists(symlinkedDir));
assertFalse(Files.isSymbolicLink(symlinkedDir));
}

@Test
public void testForceDeleteSymlink() throws Exception {
final ImmutablePair<Path, Path> pair = createTempSymbolicLinkedRelativeDir();
final Path symlinkedDir = pair.getLeft();
final Path targetDir = pair.getRight();

assertTrue(Files.exists(symlinkedDir));
assertTrue(Files.isSymbolicLink(symlinkedDir));
assertTrue(Files.exists(targetDir));

FileUtils.forceDelete(symlinkedDir.toFile());

// check targeted symlink is gone
assertFalse(Files.exists(symlinkedDir));
assertFalse(Files.isSymbolicLink(symlinkedDir));
// dir targeted by symlink is not deleted
assertTrue(Files.exists(targetDir));
}

@Test
void testForceMkdir() throws Exception {
// Tests with existing directory
Expand Down
Loading