motiejus
/
jgit
1
Fork 0
Code Releases Activity

Replace deprecated release() methods by close() in Merger 

Change-Id: I80ce98511a6e9048f1eea93288d6960dcbf3326f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2015-04-04 00:19:39 +02:00
parent 81c84c088f
commit 8e332f1057
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
View File

@ -125,9 +125,9 @@ public ObjectInserter getObjectInserter() {
* repository instance returned by {@link #getRepository()}. * repository instance returned by {@link #getRepository()}.
*/ */
public void setObjectInserter(ObjectInserter oi) { public void setObjectInserter(ObjectInserter oi) {
walk.release(); walk.close();
reader.release(); reader.close();
inserter.release(); inserter.close();
inserter = oi; inserter = oi;
reader = oi.newReader(); reader = oi.newReader();
walk = new RevWalk(reader); walk = new RevWalk(reader);
@ -206,8 +206,8 @@ public boolean merge(final boolean flush, final AnyObjectId... tips)
return ok; return ok;
} finally { } finally {
if (flush) if (flush)
inserter.release(); inserter.close();
reader.release(); reader.close();
} }
} }