motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Merge branch 'stable-4.11' into stable-5.0" into stable-5.1

This commit is contained in:
David Pursehouse 2018-10-20 01:39:43 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent b6e2800560 647ad2f0f2
commit 4728a32699
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java
View File

@ -124,13 +124,18 @@ public void onWritePossible() throws IOException {
} else { } else {
buffer.flip(); buffer.flip();
} }
} catch(Throwable t) { } catch (Throwable t) {
LOG.log(Level.SEVERE, t.getMessage(), t); LOG.log(Level.SEVERE, t.getMessage(), t);
buffer = null; buffer = null;
} finally { } finally {
if (buffer != null) { if (buffer != null) {
outChannel.write(buffer); outChannel.write(buffer);
} else { } else {
try {
in.close();
} catch (IOException e) {
LOG.log(Level.SEVERE, e.getMessage(), e);
}
try { try {
out.close(); out.close();
} finally { } finally {