Let LockFile.unlock use FileUtils.delete()

We sometimes face the problem that the file .git/index.lock
can't deleted causing JGit operations to fail. Problem is
that LockFile.unlock() simply deletes the lockfile and ignores the
return value of File.delete(). Instead use
FileUtils.delete() with retry option. This method will retry the
deletion of the file at most 10 times with sleeps inbetween.

Bug: 335959
Change-Id: I9598edea9f2304fe12e6f470301211b503434848
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/LockFile.java
index 6acd7132ad9ce9fad3038747cb455842d917e462..08dfd7e19bb342167da21eaa6f77a897db7febd8 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/LockFile.java
@@ -488,7 +488,11 @@ public class LockFile {
 
                if (haveLck) {
                        haveLck = false;
-                       lck.delete();
+                       try {
+                               FileUtils.delete(lck, FileUtils.RETRY);
+                       } catch (IOException e) {
+                               // couldn't delete the file even after retry.
+                       }
                }
        }