Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2018-09-25 23:17:54 +0000
committerDavid Pursehouse2018-09-25 23:17:59 +0000
commit8ee64116b86009495920fcc91339ce9053e75dd9 (patch)
tree45ac49a4f3e87007dc409c87de0cd8918a2a88b0 /org.eclipse.jgit.lfs.server
parent3d7476b1b31eb8ded0532bb9b4d76b3557beebf9 (diff)
parentffdaa0ff8ff8ced99df4f6fc75855f7f28d3a838 (diff)
downloadjgit-8ee64116b86009495920fcc91339ce9053e75dd9.tar.gz
jgit-8ee64116b86009495920fcc91339ce9053e75dd9.tar.xz
jgit-8ee64116b86009495920fcc91339ce9053e75dd9.zip
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: I3dff04d2ea99e5b6331e45e3ea2ccc78fb2d5a02 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;
}
}

Back to the top