aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.server
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-09-26 08:30:45 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-26 08:30:49 +0900
commit6397e220a38aa224171a43a856fa63a2b9c6f8e6 (patch)
treeb1a1e20c3831309509da0951077b556f9d73ea95 /org.eclipse.jgit.lfs.server
parent9c71cda06f347d276d825cf735e61bc0b4b91adc (diff)
parent41b1a71cf3ae571fd9808a96f827bfe660f198ab (diff)
downloadjgit-6397e220a38aa224171a43a856fa63a2b9c6f8e6.tar.gz
jgit-6397e220a38aa224171a43a856fa63a2b9c6f8e6.zip
Merge branch 'stable-5.1'
* stable-5.1: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Ie0b2b4aa4e5629d57b8104b64298d33de76abd82 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
index ef359121bb..62601915ee 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
@@ -136,6 +136,10 @@ public class ObjectDownloadListener implements WriteListener {
} finally {
context.complete();
}
+ // This is need to avoid endless loop in recent Jetty versions.
+ // That's because out.isReady() is returning true for already
+ // closed streams and because out.close() doesn't throw any
+ // exception any more when trying to close already closed stream.
return;
}
}