Merge "Use try-with-resource to close resources in BundleFetchConnection"
This commit is contained in:
commit
32cc3c3096
|
@ -183,16 +183,13 @@ protected void doFetch(final ProgressMonitor monitor,
|
|||
throws TransportException {
|
||||
verifyPrerequisites();
|
||||
try {
|
||||
ObjectInserter ins = transport.local.newObjectInserter();
|
||||
try {
|
||||
try (ObjectInserter ins = transport.local.newObjectInserter()) {
|
||||
PackParser parser = ins.newPackParser(bin);
|
||||
parser.setAllowThin(true);
|
||||
parser.setObjectChecker(transport.getObjectChecker());
|
||||
parser.setLockMessage(lockMessage);
|
||||
packLock = parser.parse(NullProgressMonitor.INSTANCE);
|
||||
ins.flush();
|
||||
} finally {
|
||||
ins.release();
|
||||
}
|
||||
} catch (IOException err) {
|
||||
close();
|
||||
|
@ -217,8 +214,7 @@ private void verifyPrerequisites() throws TransportException {
|
|||
if (prereqs.isEmpty())
|
||||
return;
|
||||
|
||||
final RevWalk rw = new RevWalk(transport.local);
|
||||
try {
|
||||
try (final RevWalk rw = new RevWalk(transport.local)) {
|
||||
final RevFlag PREREQ = rw.newFlag("PREREQ"); //$NON-NLS-1$
|
||||
final RevFlag SEEN = rw.newFlag("SEEN"); //$NON-NLS-1$
|
||||
|
||||
|
@ -281,8 +277,6 @@ private void verifyPrerequisites() throws TransportException {
|
|||
throw new MissingBundlePrerequisiteException(transport.uri,
|
||||
missing);
|
||||
}
|
||||
} finally {
|
||||
rw.release();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue