Skip to content

Fix deleteQuietly handling for symlinked directories - #873

Open
Sn0wyDay wants to merge 1 commit into
apache:masterfrom
Sn0wyDay:fix-deletequietly-symlink-directory
Open

Fix deleteQuietly handling for symlinked directories#873
Sn0wyDay wants to merge 1 commit into
apache:masterfrom
Sn0wyDay:fix-deletequietly-symlink-directory

Conversation

@Sn0wyDay

@Sn0wyDay Sn0wyDay commented Aug 24, 2026

Copy link
Copy Markdown

Thanks for your contribution to Apache Commons! Your help is appreciated!

Before you push a pull request, review this list:

  • Read the contribution guidelines for this project.
  • Read the ASF Generative Tooling Guidance if you use Artificial Intelligence (AI).
  • I used AI to create any part of, or all of, this pull request. Which AI tool was used to create this pull request, and to what extent did it contribute?
  • Run a successful build using the default Maven goal with mvn; that's mvn on the command line by itself.
  • Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible, but it is a best practice.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Each commit in the pull request should have a meaningful subject line and body. Note that a maintainer may squash commits during the merge process.

Summary

This PR updates FileUtils.deleteQuietly(File) so that it does not clean the target contents when the input is a symbolic link to a directory.

Previously, deleteQuietly() checked file.isDirectory() and then called cleanDirectory(file) before deleting the file. On platforms where a symbolic link to a directory is treated as a directory, this could remove the contents of the symlink target before deleting the symlink itself.

deleteDirectory() already avoids this behavior by checking !isSymlink(directory) before cleaning directory contents. This PR applies the same safety check to deleteQuietly() for consistency.

Change

Before:

if (file.isDirectory()) {
    cleanDirectory(file);
}

After:

if (file.isDirectory() && !isSymlink(file)) {
    cleanDirectory(file);
}

Tests

Added a regression test to verify that calling deleteQuietly() on a symlinked directory deletes only the symlink and preserves the target directory contents.

The following tests passed locally:

mvn -Dtest=FileUtilsCleanSymlinksTest#testDeleteQuietlyWithASymlinkDirDeletesOnlyLink test
mvn -Dtest=FileUtilsCleanSymlinksTest test

AI tooling disclosure

AI-assisted tools were used to help identify the candidate issue and draft the initial patch explanation. The final code change and test were reviewed and validated manually before submission.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant