diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-09-26 08:18:51 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-09-26 08:18:54 +0900 |
| commit | 7893fcb0b480e5a59b72dd98757aab21777ceb33 (patch) | |
| tree | 7ab5eecf67748bbcdc57d6d0ceb5627cf1f909b5 /org.eclipse.jgit.lfs.server/src/org | |
| parent | a59bf16843774d6227cef3b4fb4b876bda45b816 (diff) | |
| parent | 6b82c9ff7f208afacce80f522e5e7eea97ec9f12 (diff) | |
| download | jgit-7893fcb0b480e5a59b72dd98757aab21777ceb33.tar.gz jgit-7893fcb0b480e5a59b72dd98757aab21777ceb33.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
ObjectDownloadListener#onWritePossible: Add comment on return statement
Change-Id: Icacfa8dcd1ced32715fb772c336574318f28ddd1
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.lfs.server/src/org')
| -rw-r--r-- | org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java | 4 |
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; } } |