Close ObjectInserters in tests

Change-Id: I0048a9ae23aee79cfecafb15855c63cd92818c57
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java

@@ -700,8 +700,8 @@ public class AddCommandTest extends RepositoryTestCase {
 			writer.print("content b");
 		}
 
-		ObjectInserter newObjectInserter = db.newObjectInserter();
 		DirCache dc = db.lockDirCache();
+		try (ObjectInserter newObjectInserter = db.newObjectInserter()) {
 			DirCacheBuilder builder = dc.builder();
 
 			addEntryToBuilder("b.txt", file2, newObjectInserter, builder, 0);
@@ -719,7 +719,7 @@ public class AddCommandTest extends RepositoryTestCase {
 					.getObjectId();
 
 			builder.commit();
-
+		}
 		assertEquals(
 				"[a.txt, mode:100644, stage:1, content:content]" +
 				"[a.txt, mode:100644, stage:2, content:our content]" +

org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java

@@ -341,48 +341,56 @@ public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase {
 			String... path) throws GitAPIException, IOException {
 		try (Git git = new Git(db);
 				RevWalk revWalk = new RevWalk(git.getRepository())) {
-			ObjectInserter newObjectInserter;
+			ObjectId blobId;
-			newObjectInserter = git.getRepository().newObjectInserter();
+			try (ObjectInserter newObjectInserter = git.getRepository()
-			ObjectId blobId = newObjectInserter.insert(Constants.OBJ_BLOB,
+					.newObjectInserter()) {
+				blobId = newObjectInserter.insert(Constants.OBJ_BLOB,
 					"data".getBytes(UTF_8));
-			newObjectInserter = git.getRepository().newObjectInserter();
+			}
 			FileMode mode = FileMode.REGULAR_FILE;
 			ObjectId insertId = blobId;
+			try (ObjectInserter newObjectInserter = git.getRepository()
+					.newObjectInserter()) {
 				for (int i = path.length - 1; i >= 0; --i) {
 					TreeFormatter treeFormatter = new TreeFormatter();
 					treeFormatter.append("goodpath", mode, insertId);
 					insertId = newObjectInserter.insert(treeFormatter);
 					mode = FileMode.TREE;
 				}
-			newObjectInserter = git.getRepository().newObjectInserter();
+			}
+			ObjectId firstCommitId;
+			try (ObjectInserter newObjectInserter = git.getRepository()
+					.newObjectInserter()) {
 				CommitBuilder commitBuilder = new CommitBuilder();
 				commitBuilder.setAuthor(author);
 				commitBuilder.setCommitter(committer);
 				commitBuilder.setMessage("foo#1");
 				commitBuilder.setTreeId(insertId);
-			ObjectId firstCommitId = newObjectInserter.insert(commitBuilder);
+				firstCommitId = newObjectInserter.insert(commitBuilder);
-
+			}
-			newObjectInserter = git.getRepository().newObjectInserter();
+			ObjectId commitId;
+			try (ObjectInserter newObjectInserter = git.getRepository()
+					.newObjectInserter()) {
 				mode = FileMode.REGULAR_FILE;
 				insertId = blobId;
 				for (int i = path.length - 1; i >= 0; --i) {
 					TreeFormatter treeFormatter = new TreeFormatter();
 					treeFormatter.append(path[i].getBytes(UTF_8), 0,
-						path[i].getBytes(UTF_8).length,
+							path[i].getBytes(UTF_8).length, mode, insertId,
-							mode, insertId, true);
+							true);
 					insertId = newObjectInserter.insert(treeFormatter);
 					mode = FileMode.TREE;
 				}
 
 				// Create another commit
-			commitBuilder = new CommitBuilder();
+				CommitBuilder commitBuilder = new CommitBuilder();
 				commitBuilder.setAuthor(author);
 				commitBuilder.setCommitter(committer);
 				commitBuilder.setMessage("foo#2");
 				commitBuilder.setTreeId(insertId);
 				commitBuilder.setParentId(firstCommitId);
-			ObjectId commitId = newObjectInserter.insert(commitBuilder);
+				commitId = newObjectInserter.insert(commitBuilder);
-
+			}
 			if (!secondCheckout)
 				git.checkout().setStartPoint(revWalk.parseCommit(firstCommitId))
 						.setName("refs/heads/master").setCreateBranch(true).call();

org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java

@@ -349,9 +349,11 @@ public class DirCacheCheckoutTest extends RepositoryTestCase {
 			DirCacheEditor editor = dirCache.editor();
 			for (java.util.Map.Entry<String,String> e : indexEntries.entrySet()) {
 				writeTrashFile(e.getKey(), e.getValue());
-				ObjectInserter inserter = db.newObjectInserter();
+				ObjectId id;
-				final ObjectId id = inserter.insert(Constants.OBJ_BLOB,
+				try (ObjectInserter inserter = db.newObjectInserter()) {
+					id = inserter.insert(Constants.OBJ_BLOB,
 						Constants.encode(e.getValue()));
+				}
 				editor.add(new DirCacheEditor.DeletePath(e.getKey()));
 				editor.add(new DirCacheEditor.PathEdit(e.getKey()) {
 					@Override

org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java

@@ -81,10 +81,12 @@ public class IndexDiffTest extends RepositoryTestCase {
 
 	static PathEdit add(final Repository db, final File workdir,
 			final String path) throws FileNotFoundException, IOException {
-		ObjectInserter inserter = db.newObjectInserter();
 		final File f = new File(workdir, path);
-		final ObjectId id = inserter.insert(Constants.OBJ_BLOB,
+		ObjectId id;
+		try (ObjectInserter inserter = db.newObjectInserter()) {
+			id = inserter.insert(Constants.OBJ_BLOB,
 				IO.readFully(f));
+		}
 		return new PathEdit(path) {
 			@Override
 			public void apply(DirCacheEntry ent) {