Browse Source

Merge "Use try-with-resource to close resources in BundleFetchConnection"

tags/v4.0.0.201505050340-m2
Shawn Pearce 9 years ago
parent
commit
32cc3c3096

+ 2
- 8
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java View File

@@ -183,16 +183,13 @@ class BundleFetchConnection extends BaseFetchConnection {
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 @@ class BundleFetchConnection extends BaseFetchConnection {
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 @@ class BundleFetchConnection extends BaseFetchConnection {
throw new MissingBundlePrerequisiteException(transport.uri,
missing);
}
} finally {
rw.release();
}
}


Loading…
Cancel
Save