diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-09-26 23:37:39 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-09-26 23:37:39 +0200 |
| commit | 1cd87ab79065b78a0774f20f1bfd522747c37c15 (patch) | |
| tree | 4906fe03220ddf779576133d2f7875d6d23a8baa /org.eclipse.jgit | |
| parent | 692ccfc0c29d53afc7a0b82f41efcd999ed217b0 (diff) | |
| parent | 9e7d2acadd3ebeb3995ebd00c0ca4a86e1f4ea67 (diff) | |
| download | jgit-1cd87ab79065b78a0774f20f1bfd522747c37c15.tar.gz jgit-1cd87ab79065b78a0774f20f1bfd522747c37c15.zip | |
Merge branch 'stable-6.9' into stable-6.10
* stable-6.9:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I662c7a76470cedf0d4c975c50c3981c1c86245f2
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 9318871520..1dcfe5691f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -1996,10 +1996,9 @@ public class UploadPack implements Closeable { @Override public void checkWants(UploadPack up, List<ObjectId> wants) throws PackProtocolException, IOException { - if (!up.isBiDirectionalPipe()) + if (!up.isBiDirectionalPipe() || !wants.isEmpty()) { new ReachableCommitRequestValidator().checkWants(up, wants); - else if (!wants.isEmpty()) - throw new WantNotValidException(wants.iterator().next()); + } } } |