motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "When renaming the lock file succeeds the lock isn't held anymore"

This commit is contained in:
Robin Rosenberg 2013-03-28 15:57:38 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 1f51aecf95 d059f85c0b
commit 4796fe7043
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,11 +437,16 @@ public boolean commit() {
} }
saveStatInformation(); saveStatInformation();
if (lck.renameTo(ref)) if (lck.renameTo(ref)) {
haveLck = false;
return true; return true;
if (!ref.exists() || deleteRef()) }
if (renameLock()) if (!ref.exists() || deleteRef()) {
if (renameLock()) {
haveLck = false;
return true; return true;
}
}
unlock(); unlock();
return false; return false;
} }