From: Matthias Sohn <matthias.sohn@sap.com>
Date: Fri, 3 Apr 2015 22:19:39 +0000 (+0200)
Subject: Replace deprecated release() methods by close() in Merger
X-Git-Tag: v4.0.0.201505050340-m2~1^2~38^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e332f10577a93b83885ba36d994e780b8724ef1;p=jgit.git

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

Change-Id: I80ce98511a6e9048f1eea93288d6960dcbf3326f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

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();
 		}
 	}