Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2018-09-25 23:17:26 +0000
committerDavid Pursehouse2018-09-25 23:17:30 +0000
commitffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838 (patch)
tree73ca0f31205ad6f7d925b2edcb1bdd3c3d75b075 /org.eclipse.jgit.lfs.server
parent430ff2187cb0e87e86056e3d4957ecc0dd5924d3 (diff)
parent33c9906886b2c03c434b06ef622cd2b5277149ea (diff)
downloadjgit-ffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838.tar.gz
jgit-ffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838.tar.xz
jgit-ffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838.zip
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Ie3de769209ec8477c97df5f90b8c63c03e023be0 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 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;
}
}

Back to the top