diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-10-20 14:29:12 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-10-20 14:29:12 +0900 |
| commit | f40a5a12e4f8e13c20a08b4408afad4b41f0f302 (patch) | |
| tree | d897a647fc5456e40736253478d42711cd23dee3 /org.eclipse.jgit.lfs.server | |
| parent | e63ca8d09432efbc35c5b5884aba7702be2cd7f0 (diff) | |
| parent | 9b6d30f2c145243bfdb1708bef847538a0df640d (diff) | |
| download | jgit-f40a5a12e4f8e13c20a08b4408afad4b41f0f302.tar.gz jgit-f40a5a12e4f8e13c20a08b4408afad4b41f0f302.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
Prepare 4.11.6-SNAPSHOT builds
JGit v4.11.5.201810191925-r
Prepare 4.9.8-SNAPSHOT builds
JGit v4.9.7.201810191756-r
Update API problem filter
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: Ib6493d2b6270fe4f237ea52d97848239c16c1d9d
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 | 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 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(); |