Browse Source

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

stable-4.1
Shawn Pearce 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
66a95621a3
  1. 10
      org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java

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

@ -125,9 +125,9 @@ public abstract class Merger {
* 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 abstract class Merger {
return ok; return ok;
} finally { } finally {
if (flush) if (flush)
inserter.release(); inserter.close();
reader.release(); reader.close();
} }
} }

Loading…
Cancel
Save