motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes Ic555e6e0,Id4cb9a23 

* changes:
  Replace use of deprecated release() method in BlameResult
  Use try-with-resource to close BlameGenerator
This commit is contained in:
Shawn Pearce 2015-04-08 20:59:03 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent f96e15b1e6 48622e0ec2
commit 9b9087d47d
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java
View File

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

8
org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java
View File

@ -85,7 +85,7 @@ public static BlameResult create(BlameGenerator gen) throws IOException {
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 void computeAll() throws IOException {
while (gen.next())
loadFrom(gen);
} finally {
gen.release();
gen.close();
generator = null;
}
}
@ -265,7 +265,7 @@ public int computeNext() throws IOException {
lastLength = gen.getRegionLength();
return gen.getResultStart();
} else {
gen.release();
gen.close();
generator = null;
return -1;
}
@ -300,7 +300,7 @@ public void computeRange(int start, int end) throws IOException {
return;
if (!gen.next()) {
gen.release();
gen.close();
generator = null;
return;
}