Replace deprecated release() methods by close()

See the discussion [1] in the Gerrit mailing list.

[1] https://groups.google.com/forum/#!topic/repo-discuss/RRQT_xCqz4o

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

1 files changed, 29 insertions, 27 deletions

diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
index bc225cc017..83148d0009 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
@@ -307,26 +307,27 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase {
 	 */
 	protected void resetIndex(FileTreeIterator treeItr)
 			throws FileNotFoundException, IOException {
-		ObjectInserter inserter = db.newObjectInserter();
-		DirCacheBuilder builder = db.lockDirCache().builder();
-		DirCacheEntry dce;
-
-		while (!treeItr.eof()) {
-			long len = treeItr.getEntryLength();
-
-			dce = new DirCacheEntry(treeItr.getEntryPathString());
-			dce.setFileMode(treeItr.getEntryFileMode());
-			dce.setLastModified(treeItr.getEntryLastModified());
-			dce.setLength((int) len);
-			FileInputStream in = new FileInputStream(treeItr.getEntryFile());
-			dce.setObjectId(inserter.insert(Constants.OBJ_BLOB, len, in));
-			in.close();
-			builder.add(dce);
-			treeItr.next(1);
+		try (ObjectInserter inserter = db.newObjectInserter()) {
+			DirCacheBuilder builder = db.lockDirCache().builder();
+			DirCacheEntry dce;
+
+			while (!treeItr.eof()) {
+				long len = treeItr.getEntryLength();
+
+				dce = new DirCacheEntry(treeItr.getEntryPathString());
+				dce.setFileMode(treeItr.getEntryFileMode());
+				dce.setLastModified(treeItr.getEntryLastModified());
+				dce.setLength((int) len);
+				FileInputStream in = new FileInputStream(
+						treeItr.getEntryFile());
+				dce.setObjectId(inserter.insert(Constants.OBJ_BLOB, len, in));
+				in.close();
+				builder.add(dce);
+				treeItr.next(1);
+			}
+			builder.commit();
+			inserter.flush();
 		}
-		builder.commit();
-		inserter.flush();
-		inserter.release();
 	}
 
 	/**
@@ -410,14 +411,15 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase {
 
 	protected void checkoutBranch(String branchName)
 			throws IllegalStateException, IOException {
-		RevWalk walk = new RevWalk(db);
-		RevCommit head = walk.parseCommit(db.resolve(Constants.HEAD));
-		RevCommit branch = walk.parseCommit(db.resolve(branchName));
-		DirCacheCheckout dco = new DirCacheCheckout(db, head.getTree().getId(),
-				db.lockDirCache(), branch.getTree().getId());
-		dco.setFailOnConflict(true);
-		dco.checkout();
-		walk.release();
+		try (RevWalk walk = new RevWalk(db)) {
+			RevCommit head = walk.parseCommit(db.resolve(Constants.HEAD));
+			RevCommit branch = walk.parseCommit(db.resolve(branchName));
+			DirCacheCheckout dco = new DirCacheCheckout(db,
+					head.getTree().getId(), db.lockDirCache(),
+					branch.getTree().getId());
+			dco.setFailOnConflict(true);
+			dco.checkout();
+		}
 		// update the HEAD
 		RefUpdate refUpdate = db.updateRef(Constants.HEAD);
 		refUpdate.setRefLogMessage("checkout: moving to " + branchName, false);