diff options
| author | David Pursehouse | 2018-09-25 23:16:47 +0000 |
|---|---|---|
| committer | David Pursehouse | 2018-09-25 23:16:53 +0000 |
| commit | 33c9906886b2c03c434b06ef622cd2b5277149ea (patch) | |
| tree | ced0e447f5939544e4a8531f27c6764fd843a399 /org.eclipse.jgit.lfs.server | |
| parent | e4dd83a120c5e6902a0f086700f23746386f2ced (diff) | |
| parent | e5a4c0d17e532824e0d379cb1c322296b07c73f9 (diff) | |
| download | jgit-33c9906886b2c03c434b06ef622cd2b5277149ea.tar.gz jgit-33c9906886b2c03c434b06ef622cd2b5277149ea.tar.xz jgit-33c9906886b2c03c434b06ef622cd2b5277149ea.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
ObjectDownloadListener#onWritePossible: Add comment on return statement
Change-Id: Id0833112b0be4e78af375ee1fc78287743d7bc4c
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.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 60258602f1..2dc9493f3f 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 @@ -134,6 +134,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; } } |