diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-03-28 15:57:38 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-03-28 15:57:38 -0400 |
| commit | 4796fe70432d882f1d51d9fec59c111107be44f8 (patch) | |
| tree | b632bc6c281ea62376fb28954143b69b3af32d70 | |
| parent | 1f51aecf95d61e48618d478a693f73dcf1ec1146 (diff) | |
| parent | d059f85c0bb2f9de9977cf4e0f1f72647aa4b4b2 (diff) | |
| download | jgit-4796fe70432d882f1d51d9fec59c111107be44f8.tar.gz jgit-4796fe70432d882f1d51d9fec59c111107be44f8.zip | |
Merge "When renaming the lock file succeeds the lock isn't held anymore"
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java index 625ec343fd..06eb42cbbc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java @@ -437,11 +437,16 @@ public class LockFile { } saveStatInformation(); - if (lck.renameTo(ref)) + if (lck.renameTo(ref)) { + haveLck = false; return true; - if (!ref.exists() || deleteRef()) - if (renameLock()) + } + if (!ref.exists() || deleteRef()) { + if (renameLock()) { + haveLck = false; return true; + } + } unlock(); return false; } |