SubmoduleWalk: Open Repository in try-with-resource

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

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java
index 2314cf10dfaec0ba8b4b496d09b73b569e7f4bfb..0fc11f697cd0036c66120b80368e88a90ab44a14 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java
@@ -754,13 +754,11 @@ public class SubmoduleWalk implements AutoCloseable {
         * @throws java.io.IOException
         */
        public ObjectId getHead() throws IOException {
-               Repository subRepo = getRepository();
-               if (subRepo == null)
-                       return null;
-               try {
+               try (Repository subRepo = getRepository()) {
+                       if (subRepo == null) {
+                               return null;
+                       }
                        return subRepo.resolve(Constants.HEAD);
-               } finally {
-                       subRepo.close();
                }
        }
 
@@ -771,14 +769,12 @@ public class SubmoduleWalk implements AutoCloseable {
         * @throws java.io.IOException
         */
        public String getHeadRef() throws IOException {
-               Repository subRepo = getRepository();
-               if (subRepo == null)
-                       return null;
-               try {
+               try (Repository subRepo = getRepository()) {
+                       if (subRepo == null) {
+                               return null;
+                       }
                        Ref head = subRepo.exactRef(Constants.HEAD);
                        return head != null ? head.getLeaf().getName() : null;
-               } finally {
-                       subRepo.close();
                }
        }