DefaultNoteMerger: Open UnionInputStream in try-with-resource

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

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 87bd4b55b1ee3c29289b29ad91b77eccf5e022a1..54a2d8996a0087ce2a28f211b91f6ba117c253b6 100644 (file)
--- 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();
                }
        }
 }