motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Christian Halstrick 2011-03-30 17:29:10 +02:00
parent c261b28f67
commit d8bcc84154
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/LockFile.java
View File

@ -488,7 +488,11 @@ public void unlock() {
if (haveLck) {
haveLck = false;
lck.delete();
try {
FileUtils.delete(lck, FileUtils.RETRY);
} catch (IOException e) {
// couldn't delete the file even after retry.
}
}
}