Suppress warning for trying to delete non-empty directory
This is actually a fairly common occurrence; deleting the parent directories can work only if the file deleted was the last one in the directory. Bug: 537872 Change-Id: I86d1d45e1e2631332025ff24af8dfd46c9725711 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
parent
ffd1ac5dde
commit
d9e767b431
|
@ -65,6 +65,7 @@
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.InterruptedIOException;
|
import java.io.InterruptedIOException;
|
||||||
|
import java.nio.file.DirectoryNotEmptyException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.security.DigestInputStream;
|
import java.security.DigestInputStream;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
|
@ -1275,6 +1276,10 @@ private static void delete(final File file, final int depth, LockFile rLck)
|
||||||
for (int i = 0; i < depth; ++i) {
|
for (int i = 0; i < depth; ++i) {
|
||||||
try {
|
try {
|
||||||
Files.delete(dir.toPath());
|
Files.delete(dir.toPath());
|
||||||
|
} catch (DirectoryNotEmptyException e) {
|
||||||
|
// Don't log; normal case when there are other refs with the
|
||||||
|
// same prefix
|
||||||
|
break;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LOG.warn("Unable to remove path {}", dir, e);
|
LOG.warn("Unable to remove path {}", dir, e);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue