motiejus
/
jgit
1
Fork 0
Code Releases Activity

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

This commit is contained in:
Shawn Pearce 2015-04-08 20:57:51 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 7810d9bc42 9e37f6d144
commit 32cc3c3096
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
View File

@ -183,16 +183,13 @@ protected void doFetch(final ProgressMonitor monitor,
throws TransportException { throws TransportException {
verifyPrerequisites(); verifyPrerequisites();
try { try {
ObjectInserter ins = transport.local.newObjectInserter(); try (ObjectInserter ins = transport.local.newObjectInserter()) {
try {
PackParser parser = ins.newPackParser(bin); PackParser parser = ins.newPackParser(bin);
parser.setAllowThin(true); parser.setAllowThin(true);
parser.setObjectChecker(transport.getObjectChecker()); parser.setObjectChecker(transport.getObjectChecker());
parser.setLockMessage(lockMessage); parser.setLockMessage(lockMessage);
packLock = parser.parse(NullProgressMonitor.INSTANCE); packLock = parser.parse(NullProgressMonitor.INSTANCE);
ins.flush(); ins.flush();
} finally {
ins.release();
} }
} catch (IOException err) { } catch (IOException err) {
close(); close();
@ -217,8 +214,7 @@ private void verifyPrerequisites() throws TransportException {
if (prereqs.isEmpty()) if (prereqs.isEmpty())
return; return;
final RevWalk rw = new RevWalk(transport.local); try (final RevWalk rw = new RevWalk(transport.local)) {
try {
final RevFlag PREREQ = rw.newFlag("PREREQ"); //$NON-NLS-1$ final RevFlag PREREQ = rw.newFlag("PREREQ"); //$NON-NLS-1$
final RevFlag SEEN = rw.newFlag("SEEN"); //$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, throw new MissingBundlePrerequisiteException(transport.uri,
missing); missing);
} }
} finally {
rw.release();
} }
} }