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 d786a18ff29be0897a9402fb7c08dfaa9ba3cc55..a76dd350d590b8ca4ddc0788fae0279a2d05dd11 100644 (file)
--- 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();
                }
        }