Merge changes I184945ee,Iacaad1a7

* changes:
  Remove unnecessary $NON-NLS comment in BaseReceivePack
  Use try-with-resources to close resources in BaseReceivePack

org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java

@@ -317,7 +317,7 @@ public abstract class BaseReceivePack {
 					"denynonfastforwards", false); //$NON-NLS-1$
 			allowOfsDelta = config.getBoolean("repack", "usedeltabaseoffset", //$NON-NLS-1$ //$NON-NLS-2$
 					true);
-			certNonceSeed = config.getString("receive", null, "certnonceseed"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			certNonceSeed = config.getString("receive", null, "certnonceseed"); //$NON-NLS-1$ //$NON-NLS-2$
 			certNonceSlopLimit = config.getInt("receive", "certnonceslop", 0); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
@@ -1070,8 +1070,7 @@ public abstract class BaseReceivePack {
 		if (sideBand)
 			resolving = new SideBandProgressMonitor(msgOut);
 
-		ObjectInserter ins = db.newObjectInserter();
+		try (ObjectInserter ins = db.newObjectInserter()) {
-		try {
 			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);
+		try (final ObjectWalk ow = new ObjectWalk(db)) {
-		ow.setRetainBody(false);
+			ow.setRetainBody(false);
-		if (baseObjects != null) {
+			if (baseObjects != null) {
-			ow.sort(RevSort.TOPO);
+				ow.sort(RevSort.TOPO);
-			if (!baseObjects.isEmpty())
+				if (!baseObjects.isEmpty())
-				ow.sort(RevSort.BOUNDARY, true);
+					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);
 			}
-		}
 
-		checking.beginTask(JGitText.get().countingObjects, ProgressMonitor.UNKNOWN);
+			for (final ReceiveCommand cmd : commands) {
-		RevCommit c;
+				if (cmd.getResult() != Result.NOT_ATTEMPTED)
-		while ((c = ow.next()) != null) {
+					continue;
-			checking.update(1);
+				if (cmd.getType() == ReceiveCommand.Type.DELETE)
-			if (providedObjects != null //
+					continue;
-					&& !c.has(RevFlag.UNINTERESTING) //
+				ow.markStart(ow.parseAny(cmd.getNewId()));
-					&& !providedObjects.contains(c))
+			}
-				throw new MissingObjectException(c, Constants.TYPE_COMMIT);
+			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;
+			checking.beginTask(JGitText.get().countingObjects,
-		while ((o = ow.nextObject()) != null) {
+					ProgressMonitor.UNKNOWN);
-			checking.update(1);
+			RevCommit c;
-			if (o.has(RevFlag.UNINTERESTING))
+			while ((c = ow.next()) != null) {
-				continue;
+				checking.update(1);
+				if (providedObjects != null //
+						&& !c.has(RevFlag.UNINTERESTING) //
+						&& !providedObjects.contains(c))
+					throw new MissingObjectException(c, Constants.TYPE_COMMIT);
+			}
 
-			if (providedObjects != null) {
+			RevObject o;
-				if (providedObjects.contains(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))
+				if (providedObjects != null) {
-				throw new MissingObjectException(o, Constants.TYPE_BLOB);
+					if (providedObjects.contains(o))
-		}
+						continue;
-		checking.endTask();
+					else
+						throw new MissingObjectException(o, o.getType());
+				}
 
-		if (baseObjects != null) {
+				if (o instanceof RevBlob && !db.hasObject(o))
-			for (ObjectId id : baseObjects) {
+					throw new MissingObjectException(o, Constants.TYPE_BLOB);
-				o = ow.parseAny(id);
+			}
-				if (!o.has(RevFlag.UNINTERESTING))
+			checking.endTask();
-					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());
+				}
 			}
 		}
 	}
@@ -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;