Merge changes I1a4181fc,Ic2db0511

* changes:
  Silence non-externalized string warning in PackParser
  Replace call to deprecated release() by close() in PackParser
This commit is contained in:
Shawn Pearce 2015-04-08 15:15:32 -04:00 committed by Gerrit Code Review @ Eclipse.org
commit 9bea73693e
1 changed files with 2 additions and 2 deletions

View File

@ -529,7 +529,7 @@ public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving)
} finally {
try {
if (readCurs != null)
readCurs.release();
readCurs.close();
} finally {
readCurs = null;
}
@ -812,7 +812,7 @@ private void resolveDeltasWithExternalBases(final ProgressMonitor progress)
for (final DeltaChain base : missing) {
if (base.head != null)
throw new MissingObjectException(base, "delta base");
throw new MissingObjectException(base, "delta base"); //$NON-NLS-1$
}
onEndThinPack();