diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-19 23:30:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-19 23:30:20 +0200 |
| commit | cee3ef1a0e0bf9d9afcb8745212dc93ee124914c (patch) | |
| tree | f196c737e757b4d4d6d2072ac691e89771cf37b8 | |
| parent | 9d91bf189ec233e23da0428d14526131f4cee346 (diff) | |
| parent | 566a5dcc21286b0944658d1559f1d8c61ca60cbd (diff) | |
| download | jgit-cee3ef1a0e0bf9d9afcb8745212dc93ee124914c.tar.gz jgit-cee3ef1a0e0bf9d9afcb8745212dc93ee124914c.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
Prepare 4.7.7-SNAPSHOT builds
JGit v4.7.6.201810191618-r
Update API problem filter
Fix file handle leak in ObjectDownloadListener.onWritePossible
Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml
Replace FindBugs with SpotBugs
Prepare 4.4.2-SNAPSHOT builds
JGit v4.0.3.201509231615-r
Change-Id: Ic18af2ddcba8f7a53eb27a33ea9f637adb941993
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java | 7 |
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 2dc9493f3f..a76f7ef0d8 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 @@ -122,7 +122,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 { @@ -130,6 +130,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(); |