Merge changes Ic555e6e0,Id4cb9a23

* changes:
  Replace use of deprecated release() method in BlameResult
  Use try-with-resource to close BlameGenerator

org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java

@@ -200,8 +200,7 @@ public class BlameCommand extends GitCommand<BlameResult> {
 	 */
 	public BlameResult call() throws GitAPIException {
 		checkCallable();
-		BlameGenerator gen = new BlameGenerator(repo, path);
+		try (BlameGenerator gen = new BlameGenerator(repo, path)) {
-		try {
 			if (diffAlgorithm != null)
 				gen.setDiffAlgorithm(diffAlgorithm);
 			if (textComparator != null)
@@ -231,8 +230,6 @@ public class BlameCommand extends GitCommand<BlameResult> {
 			return gen.computeBlameResult();
 		} catch (IOException e) {
 			throw new JGitInternalException(e.getMessage(), e);
-		} finally {
-			gen.release();
 		}
 	}
 

org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java

@@ -85,7 +85,7 @@ public class BlameResult {
 		String path = gen.getResultPath();
 		RawText contents = gen.getResultContents();
 		if (contents == null) {
-			gen.release();
+			gen.close();
 			return null;
 		}
 		return new BlameResult(gen, path, contents);
@@ -239,7 +239,7 @@ public class BlameResult {
 			while (gen.next())
 				loadFrom(gen);
 		} finally {
-			gen.release();
+			gen.close();
 			generator = null;
 		}
 	}
@@ -265,7 +265,7 @@ public class BlameResult {
 			lastLength = gen.getRegionLength();
 			return gen.getResultStart();
 		} else {
-			gen.release();
+			gen.close();
 			generator = null;
 			return -1;
 		}
@@ -300,7 +300,7 @@ public class BlameResult {
 				return;
 
 			if (!gen.next()) {
-				gen.release();
+				gen.close();
 				generator = null;
 				return;
 			}