From 18263417934cc6d080916aea7bf56c8206a2b0c9 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 09:47:11 +0900 Subject: DefaultNoteMerger: Open UnionInputStream in try-with-resource Change-Id: I035aa89cdbf235992f41e752f49d735be4e5df0a Signed-off-by: David Pursehouse --- org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java index 87bd4b55b1..54a2d8996a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java @@ -82,14 +82,11 @@ public class DefaultNoteMerger implements NoteMerger { ObjectLoader lo = reader.open(ours.getData()); ObjectLoader lt = reader.open(theirs.getData()); - UnionInputStream union = new UnionInputStream(lo.openStream(), - lt.openStream()); - try { + try (UnionInputStream union = new UnionInputStream(lo.openStream(), + lt.openStream())) { ObjectId noteData = inserter.insert(Constants.OBJ_BLOB, lo.getSize() + lt.getSize(), union); return new Note(ours, noteData); - } finally { - union.close(); } } } -- cgit v1.2.3 From 3393f78210862b3ccd954f029d831ef783b35c89 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 09:48:19 +0900 Subject: CommitCommand: Open InputStream in try-with-resource Change-Id: I800a2afae17f84636cae593be7f07628fb8476c1 Signed-off-by: David Pursehouse --- org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index 8a89ba1611..f2572835fc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -409,14 +409,11 @@ public class CommitCommand extends GitCommand { inserter = repo.newObjectInserter(); long contentLength = fTree .getEntryContentLength(); - InputStream inputStream = fTree - .openEntryStream(); - try { + try (InputStream inputStream = fTree + .openEntryStream()) { dcEntry.setObjectId(inserter.insert( Constants.OBJ_BLOB, contentLength, inputStream)); - } finally { - inputStream.close(); } } } -- cgit v1.2.3 From 6d437a58f1f68197a118529cefab207669592da4 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 09:49:16 +0900 Subject: DescribeCommandTest: Open FileWriter in try-with-resource Change-Id: Ida79bdae652faa88fbdb1b81e7e10b5019ff2c16 Signed-off-by: David Pursehouse --- .../tst/org/eclipse/jgit/api/DescribeCommandTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java index d78a328402..79da2da7ea 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java @@ -297,9 +297,9 @@ public class DescribeCommandTest extends RepositoryTestCase { } private static void touch(File f, String contents) throws Exception { - FileWriter w = new FileWriter(f); - w.write(contents); - w.close(); + try (FileWriter w = new FileWriter(f)) { + w.write(contents); + } } private String describe(ObjectId c1, boolean longDesc) -- cgit v1.2.3 From e46654823543ea74dea29478d8dbd2470d6190a5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 09:52:12 +0900 Subject: DiffAlgorithms: Open Repository in try-with-resource Change-Id: I67cb486283213f8aa964333533c55966518baa36 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java index 5f8ebdb1a9..0e1b398a73 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java @@ -160,11 +160,8 @@ class DiffAlgorithms extends TextBuiltin { else rb.findGitDir(dir); - Repository repo = rb.build(); - try { + try (Repository repo = rb.build()) { run(repo); - } finally { - repo.close(); } } } -- cgit v1.2.3 From e2d875ee30a14a1094c322b89b183f6021e46bdd Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 6 Mar 2018 10:40:35 +0900 Subject: DiffCommand: Open DiffFormatter in try-with-resource Change-Id: I22bd1062d64b01bb98cdaf612482538114624b7f Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/api/DiffCommand.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index 4c6f351142..f65b5735de 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -104,6 +104,12 @@ public class DiffCommand extends GitCommand> { super(repo); } + private DiffFormatter getDiffFormatter() { + return out != null && !showNameAndStatusOnly + ? new DiffFormatter(new BufferedOutputStream(out)) + : new DiffFormatter(NullOutputStream.INSTANCE); + } + /** * {@inheritDoc} *

@@ -114,14 +120,9 @@ public class DiffCommand extends GitCommand> { */ @Override public List call() throws GitAPIException { - final DiffFormatter diffFmt; - if (out != null && !showNameAndStatusOnly) - diffFmt = new DiffFormatter(new BufferedOutputStream(out)); - else - diffFmt = new DiffFormatter(NullOutputStream.INSTANCE); - diffFmt.setRepository(repo); - diffFmt.setProgressMonitor(monitor); - try { + try (DiffFormatter diffFmt = getDiffFormatter()) { + diffFmt.setRepository(repo); + diffFmt.setProgressMonitor(monitor); if (cached) { if (oldTree == null) { ObjectId head = repo.resolve(HEAD + "^{tree}"); //$NON-NLS-1$ @@ -159,8 +160,6 @@ public class DiffCommand extends GitCommand> { } } catch (IOException e) { throw new JGitInternalException(e.getMessage(), e); - } finally { - diffFmt.close(); } } -- cgit v1.2.3