diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2018-07-24 15:35:16 -0700 |
|---|---|---|
| committer | Jonathan Tan <jonathantanmy@google.com> | 2018-07-24 15:39:32 -0700 |
| commit | 7e7b00f1a5d14ceca62fd18c6e11456fc9eddd21 (patch) | |
| tree | be55a305f78c8ba7e44620332c3fb6f6943e2a69 /org.eclipse.jgit.test/tst/org | |
| parent | 280707b0fc717fdd8898242f21589f0c7c7d87be (diff) | |
| download | jgit-7e7b00f1a5d14ceca62fd18c6e11456fc9eddd21.tar.gz jgit-7e7b00f1a5d14ceca62fd18c6e11456fc9eddd21.zip | |
Send only 1 flush pkt at the end of v2 fetch
When processing a fetch using protocol v2, UploadPack#fetchV2 sends an
extraneous flush pkt when also sending a packfile (#sendPack sending its
own flush pkt). Update that method to only send the flush pkt if the
packfile is not being sent.
Change-Id: I7117a264bccd2d7f3a048645fcb8425a9d78d526
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index 2a3e1ca56d..9f49073eae 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -658,6 +658,10 @@ public class UploadPackTest { new StringWriter(), NullOutputStream.INSTANCE); PackParser pp = client.newObjectInserter().newPackParser(sb); pp.parse(NullProgressMonitor.INSTANCE); + + // Ensure that there is nothing left in the stream. + assertThat(recvStream.read(), is(-1)); + return pp.getReceivedPackStatistics(); } |