aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.server/src
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-09-26 08:19:27 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-26 08:19:32 +0900
commit41b1a71cf3ae571fd9808a96f827bfe660f198ab (patch)
treee7592790fa89e02f804fb7dcf373dd3ddba93705 /org.eclipse.jgit.lfs.server/src
parent48e21dc10b967746711a6184ced5c33208938a83 (diff)
parent7893fcb0b480e5a59b72dd98757aab21777ceb33 (diff)
downloadjgit-41b1a71cf3ae571fd9808a96f827bfe660f198ab.tar.gz
jgit-41b1a71cf3ae571fd9808a96f827bfe660f198ab.zip
Merge branch 'stable-5.0' into stable-5.1
* stable-5.0: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Ie7cb0c8a9775626cf2a2daae04b2d1f73a6c5af7 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.lfs.server/src')
-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;
}
}