Fix NoSuchFileException during directory cleanup in RefDirectory

Bug: 538285
Change-Id: Iab5c381a412cb2c2176af55189668c267ed29fbc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
(cherry picked from commit 8ab89ef066f91a7d39b705f4e61498f37291ffab)
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
index 91f5d7dc8a131635b636c23e9e2be5a57d5a6b73..8338b2c8a2ee0a2ac3db451c200e42c7cf2b1b65 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
@@ -1093,7 +1093,7 @@ public class RefDirectory extends RefDatabase {
                File dir = file.getParentFile();
                for (int i = 0; i < depth; ++i) {
                        try {
-                               Files.delete(dir.toPath());
+                               Files.deleteIfExists(dir.toPath());
                        } catch (DirectoryNotEmptyException e) {
                                // Don't log; normal case when there are other refs with the
                                // same prefix