MergeGitAttributeTest: Open FileInputStream in try-with-resource

Change-Id: Iec85eea044c46a199b5b6f6bdbb3191d817dd441
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java
index a4f3d18d1f65466a276167196e8024a158bf6946..01ca88880fa38a611699d2135dea95e8ecd5db04 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java
@@ -313,7 +313,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        WrongRepositoryStateException, NoMessageException, GitAPIException {
 
                RevCommit disableCheckedCommit;
-               FileInputStream mergeResultFile = null;
                // Set up a git with conflict commits on images
                try (Git git = new Git(db)) {
                        // First commit
@@ -352,15 +351,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
 
                        // Check that the image was not modified (no conflict marker added)
-                       mergeResultFile = new FileInputStream(
+                       try (FileInputStream mergeResultFile = new FileInputStream(
                                        db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
-                                                       .toFile());
-                       assertTrue(contentEquals(
-                                       getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
-                                       mergeResultFile));
-               } finally {
-                       if (mergeResultFile != null) {
-                               mergeResultFile.close();
+                                                       .toFile())) {
+                               assertTrue(contentEquals(
+                                               getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
+                                               mergeResultFile));
                        }
                }
        }
@@ -373,7 +369,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        WrongRepositoryStateException, NoMessageException, GitAPIException {
 
                RevCommit disableCheckedCommit;
-               FileInputStream mergeResultFile = null;
                // Set up a git whith conflict commits on images
                try (Git git = new Git(db)) {
                        // First commit
@@ -412,14 +407,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
 
                        // Check that the image was not modified (not conflict marker added)
-                       mergeResultFile = new FileInputStream(db.getWorkTree().toPath()
-                                       .resolve(ENABLED_CHECKED_GIF).toFile());
-                       assertTrue(contentEquals(
-                                       getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
-                                       mergeResultFile));
-               } finally {
-                       if (mergeResultFile != null) {
-                               mergeResultFile.close();
+                       try (FileInputStream mergeResultFile = new FileInputStream(
+                                       db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
+                                                       .toFile())) {
+                               assertTrue(contentEquals(
+                                               getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
+                                               mergeResultFile));
                        }
                }
        }
@@ -432,7 +425,6 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        NoMessageException, GitAPIException {
 
                RevCommit disableCheckedCommit;
-               FileInputStream mergeResultFile = null;
                // Set up a git whith conflict commits on images
                try (Git git = new Git(db)) {
                        // First commit
@@ -471,14 +463,12 @@ public class MergeGitAttributeTest extends RepositoryTestCase {
                        assertEquals(MergeStatus.CONFLICTING, mergeResult.getMergeStatus());
 
                        // Check that the image was not modified (not conflict marker added)
-                       mergeResultFile = new FileInputStream(db.getWorkTree().toPath()
-                                       .resolve(ENABLED_CHECKED_GIF).toFile());
-                       assertFalse(contentEquals(
-                                       getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
-                                       mergeResultFile));
-               } finally {
-                       if (mergeResultFile != null) {
-                               mergeResultFile.close();
+                       try (FileInputStream mergeResultFile = new FileInputStream(
+                                       db.getWorkTree().toPath().resolve(ENABLED_CHECKED_GIF)
+                                                       .toFile())) {
+                               assertFalse(contentEquals(
+                                               getClass().getResourceAsStream(ENABLED_CHECKED_GIF),
+                                               mergeResultFile));
                        }
                }
        }