]> source.dussan.org Git - jgit.git/commit
Release ObjectInserter in merge() not mergeImpl() 84/984/1
authorShawn O. Pearce <spearce@spearce.org>
Mon, 28 Jun 2010 16:35:55 +0000 (09:35 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 28 Jun 2010 16:35:55 +0000 (09:35 -0700)
commitb40f02eb1a2444e4a15ac4d5faef28ae8398f02d
treef1896068a60b9687659832cfeb39a2d7e7e3a622
parent5aae041a81a88d54fcc16b6584236bd8bf7fd842
Release ObjectInserter in merge() not mergeImpl()

By doing the release at the higher level class, we can ensure
the release occurs if the inserter was allocated, even if the
implementation forgets to do this.  Since the higher level class
is what allocated it, it makes sense to have it also do the release.

Change-Id: Id617b2db864c3208ed68cba4eda80e51612359ad
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java