aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2023-02-22 20:36:39 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2023-02-22 20:38:43 +0100
commitd9f75e8bb2af7307ce1d6e0a7376eb5ebe583ae4 (patch)
treecc84b572f95442358eac25467376a6fa4ecebc78
parent1691e38779d1f1d25cc6c388a91a82667ff12b34 (diff)
downloadjgit-d9f75e8bb2af7307ce1d6e0a7376eb5ebe583ae4.tar.gz
jgit-d9f75e8bb2af7307ce1d6e0a7376eb5ebe583ae4.zip
If tryLock fails to get the lock another gc has it
Change-Id: Ifd3bbcc5e0591883b774d23256949a83010ea134
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
index 7feb50688a..f25feee8f5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
@@ -1650,7 +1650,7 @@ public class GC {
channel = f.getChannel();
lock = channel.tryLock();
if (lock == null || !lock.isValid()) {
- failedToLock();
+ gcAlreadyRunning();
return false;
}
channel.write(ByteBuffer