Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2018-10-20 05:39:43 +0000
committerGerrit Code Review @ Eclipse.org2018-10-20 05:39:43 +0000
commit4728a3269995fdb040a1d9e3c3a9f9cdea3cde27 (patch)
tree7eee575f1ec690de2be8ed89beb8802e6e1d1cb8 /org.eclipse.jgit.lfs.server
parentb6e2800560dbf7348dcc1965e9069863ef96e4f5 (diff)
parent647ad2f0f28cc69bd4d3d24eab2ae8ccb3817a3f (diff)
downloadjgit-4728a3269995fdb040a1d9e3c3a9f9cdea3cde27.tar.gz
jgit-4728a3269995fdb040a1d9e3c3a9f9cdea3cde27.tar.xz
jgit-4728a3269995fdb040a1d9e3c3a9f9cdea3cde27.zip
Merge "Merge branch 'stable-4.11' into stable-5.0" into stable-5.1
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
-rw-r--r--org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java7
1 files changed, 6 insertions, 1 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 62601915ee..06a7726955 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
@@ -124,7 +124,7 @@ public class ObjectDownloadListener implements WriteListener {
} else {
buffer.flip();
}
- } catch(Throwable t) {
+ } catch (Throwable t) {
LOG.log(Level.SEVERE, t.getMessage(), t);
buffer = null;
} finally {
@@ -132,6 +132,11 @@ public class ObjectDownloadListener implements WriteListener {
outChannel.write(buffer);
} else {
try {
+ in.close();
+ } catch (IOException e) {
+ LOG.log(Level.SEVERE, e.getMessage(), e);
+ }
+ try {
out.close();
} finally {
context.complete();

Back to the top