mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-23 19:16:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-Added check for non-emtpy dirs

Browse Source
This commit is contained in:
JaniruTEC
2020-11-18 15:53:33 +01:00
parent a074450452
commit 6c440dfbbb
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/commons/src/main/java/org/cryptomator/common/mountpoint/IrregularUnmountCleaner.java
View File

@@ -73,6 +73,7 @@ class IrregularUnmountCleaner {
private void deleteEmptyDir(Path dir) throws IOException {
assert Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS);
try {
ensureIsEmpty(dir);
Files.delete(dir); // attempt to delete dir non-recursively (will fail, if there are contents)
} catch (DirectoryNotEmptyException e) {
LOG.info("Found non-empty directory in mountpoint dir: {}", dir);
@@ -86,4 +87,9 @@ class IrregularUnmountCleaner {
}
}
private void ensureIsEmpty(Path dir) throws IOException {
if(Files.newDirectoryStream(dir).iterator().hasNext()) {
throw new DirectoryNotEmptyException(dir.toString());
}
}
}