Use try-with-resources to close resources in BaseReceivePack

Change-Id: Iacaad1a7e0719541e5616d231422ea6fd4c95161
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
index dfb8ca93aa992c1ca4a22a1bc53d2655426ff7e1..9bdfbf52eaa1def6b8bbb00fc2d338461027578a 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
@@ -1070,8 +1070,7 @@ public abstract class BaseReceivePack {
                if (sideBand)
                        resolving = new SideBandProgressMonitor(msgOut);
 
-               ObjectInserter ins = db.newObjectInserter();
-               try {
+               try (ObjectInserter ins = db.newObjectInserter()) {
                        String lockMsg = "jgit receive-pack"; //$NON-NLS-1$
                        if (getRefLogIdent() != null)
                                lockMsg += " from " + getRefLogIdent().toExternalString(); //$NON-NLS-1$
@@ -1089,8 +1088,6 @@ public abstract class BaseReceivePack {
                        packLock = parser.parse(receiving, resolving);
                        packSize = Long.valueOf(parser.getPackSize());
                        ins.flush();
-               } finally {
-                       ins.release();
                }
 
                if (timeoutIn != null)
@@ -1119,67 +1116,69 @@ public abstract class BaseReceivePack {
                }
                parser = null;
 
-               final ObjectWalk ow = new ObjectWalk(db);
-               ow.setRetainBody(false);
-               if (baseObjects != null) {
-                       ow.sort(RevSort.TOPO);
-                       if (!baseObjects.isEmpty())
-                               ow.sort(RevSort.BOUNDARY, true);
-               }
-
-               for (final ReceiveCommand cmd : commands) {
-                       if (cmd.getResult() != Result.NOT_ATTEMPTED)
-                               continue;
-                       if (cmd.getType() == ReceiveCommand.Type.DELETE)
-                               continue;
-                       ow.markStart(ow.parseAny(cmd.getNewId()));
-               }
-               for (final ObjectId have : advertisedHaves) {
-                       RevObject o = ow.parseAny(have);
-                       ow.markUninteresting(o);
-
-                       if (baseObjects != null && !baseObjects.isEmpty()) {
-                               o = ow.peel(o);
-                               if (o instanceof RevCommit)
-                                       o = ((RevCommit) o).getTree();
-                               if (o instanceof RevTree)
-                                       ow.markUninteresting(o);
+               try (final ObjectWalk ow = new ObjectWalk(db)) {
+                       ow.setRetainBody(false);
+                       if (baseObjects != null) {
+                               ow.sort(RevSort.TOPO);
+                               if (!baseObjects.isEmpty())
+                                       ow.sort(RevSort.BOUNDARY, true);
                        }
-               }
 
-               checking.beginTask(JGitText.get().countingObjects, ProgressMonitor.UNKNOWN);
-               RevCommit c;
-               while ((c = ow.next()) != null) {
-                       checking.update(1);
-                       if (providedObjects != null //
-                                       && !c.has(RevFlag.UNINTERESTING) //
-                                       && !providedObjects.contains(c))
-                               throw new MissingObjectException(c, Constants.TYPE_COMMIT);
-               }
+                       for (final ReceiveCommand cmd : commands) {
+                               if (cmd.getResult() != Result.NOT_ATTEMPTED)
+                                       continue;
+                               if (cmd.getType() == ReceiveCommand.Type.DELETE)
+                                       continue;
+                               ow.markStart(ow.parseAny(cmd.getNewId()));
+                       }
+                       for (final ObjectId have : advertisedHaves) {
+                               RevObject o = ow.parseAny(have);
+                               ow.markUninteresting(o);
+
+                               if (baseObjects != null && !baseObjects.isEmpty()) {
+                                       o = ow.peel(o);
+                                       if (o instanceof RevCommit)
+                                               o = ((RevCommit) o).getTree();
+                                       if (o instanceof RevTree)
+                                               ow.markUninteresting(o);
+                               }
+                       }
 
-               RevObject o;
-               while ((o = ow.nextObject()) != null) {
-                       checking.update(1);
-                       if (o.has(RevFlag.UNINTERESTING))
-                               continue;
+                       checking.beginTask(JGitText.get().countingObjects,
+                                       ProgressMonitor.UNKNOWN);
+                       RevCommit c;
+                       while ((c = ow.next()) != null) {
+                               checking.update(1);
+                               if (providedObjects != null //
+                                               && !c.has(RevFlag.UNINTERESTING) //
+                                               && !providedObjects.contains(c))
+                                       throw new MissingObjectException(c, Constants.TYPE_COMMIT);
+                       }
 
-                       if (providedObjects != null) {
-                               if (providedObjects.contains(o))
+                       RevObject o;
+                       while ((o = ow.nextObject()) != null) {
+                               checking.update(1);
+                               if (o.has(RevFlag.UNINTERESTING))
                                        continue;
-                               else
-                                       throw new MissingObjectException(o, o.getType());
-                       }
 
-                       if (o instanceof RevBlob && !db.hasObject(o))
-                               throw new MissingObjectException(o, Constants.TYPE_BLOB);
-               }
-               checking.endTask();
+                               if (providedObjects != null) {
+                                       if (providedObjects.contains(o))
+                                               continue;
+                                       else
+                                               throw new MissingObjectException(o, o.getType());
+                               }
 
-               if (baseObjects != null) {
-                       for (ObjectId id : baseObjects) {
-                               o = ow.parseAny(id);
-                               if (!o.has(RevFlag.UNINTERESTING))
-                                       throw new MissingObjectException(o, o.getType());
+                               if (o instanceof RevBlob && !db.hasObject(o))
+                                       throw new MissingObjectException(o, Constants.TYPE_BLOB);
+                       }
+                       checking.endTask();
+
+                       if (baseObjects != null) {
+                               for (ObjectId id : baseObjects) {
+                                       o = ow.parseAny(id);
+                                       if (!o.has(RevFlag.UNINTERESTING))
+                                               throw new MissingObjectException(o, o.getType());
+                               }
                        }
                }
        }
@@ -1502,7 +1501,7 @@ public abstract class BaseReceivePack {
         *             the pack could not be unlocked.
         */
        protected void release() throws IOException {
-               walk.release();
+               walk.close();
                unlockPack();
                timeoutIn = null;
                rawIn = null;