From 8e332f10577a93b83885ba36d994e780b8724ef1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 4 Apr 2015 00:19:39 +0200 Subject: [PATCH] Replace deprecated release() methods by close() in Merger Change-Id: I80ce98511a6e9048f1eea93288d6960dcbf3326f Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/merge/Merger.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java index d786a18ff2..a76dd350d5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java @@ -125,9 +125,9 @@ public abstract class Merger { * repository instance returned by {@link #getRepository()}. */ public void setObjectInserter(ObjectInserter oi) { - walk.release(); - reader.release(); - inserter.release(); + walk.close(); + reader.close(); + inserter.close(); inserter = oi; reader = oi.newReader(); walk = new RevWalk(reader); @@ -206,8 +206,8 @@ public abstract class Merger { return ok; } finally { if (flush) - inserter.release(); - reader.release(); + inserter.close(); + reader.close(); } } -- 2.39.5