]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6884ea2) | patch
Fix overflow stream leak during merge conflicts 66/45066/1
authorShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 19:57:06 +0000 (12:57 -0700)
committerShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 20:02:09 +0000 (13:02 -0700)
commite4433e5e37b827aa6af3320635c8af0877cd4a60
tree4588c91c86e83f4aeb7d776fb6d1687d8d586699tree | snapshot
parent6884ea24cd0fcce78e9653e4d1a658eefa2cd68acommit | diff
Fix overflow stream leak during merge conflicts

When reading back from an overflowed TemporaryBuffer the InputStream
must be closed to close the FileInputStream that is reading from
the backing file.

Change-Id: Id83d8f16f5b2c2618a9f841ec3508508455a6ae1
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit