motiejus
/
jgit
1
Fork 0
Code Releases Activity

Use try-with-resources to close resources in BaseReceivePack 

Change-Id: Iacaad1a7e0719541e5616d231422ea6fd4c95161
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2015-04-02 01:11:22 +02:00
parent d94ce9c754
commit c1edc1a07e
1 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
View File

@ -1070,8 +1070,7 @@ private void receivePack() throws IOException {
if (sideBand) if (sideBand)
resolving = new SideBandProgressMonitor(msgOut); resolving = new SideBandProgressMonitor(msgOut);
ObjectInserter ins = db.newObjectInserter(); try (ObjectInserter ins = db.newObjectInserter()) {
try {
String lockMsg = "jgit receive-pack"; //$NON-NLS-1$ String lockMsg = "jgit receive-pack"; //$NON-NLS-1$
if (getRefLogIdent() != null) if (getRefLogIdent() != null)
lockMsg += " from " + getRefLogIdent().toExternalString(); //$NON-NLS-1$ lockMsg += " from " + getRefLogIdent().toExternalString(); //$NON-NLS-1$
@ -1089,8 +1088,6 @@ private void receivePack() throws IOException {
packLock = parser.parse(receiving, resolving); packLock = parser.parse(receiving, resolving);
packSize = Long.valueOf(parser.getPackSize()); packSize = Long.valueOf(parser.getPackSize());
ins.flush(); ins.flush();
} finally {
ins.release();
} }
if (timeoutIn != null) if (timeoutIn != null)
@ -1119,7 +1116,7 @@ private void checkConnectivity() throws IOException {
} }
parser = null; 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);
@ -1147,7 +1144,8 @@ private void checkConnectivity() throws IOException {
} }
} }
checking.beginTask(JGitText.get().countingObjects, ProgressMonitor.UNKNOWN); checking.beginTask(JGitText.get().countingObjects,
ProgressMonitor.UNKNOWN);
RevCommit c; RevCommit c;
while ((c = ow.next()) != null) { while ((c = ow.next()) != null) {
checking.update(1); checking.update(1);
@ -1183,6 +1181,7 @@ private void checkConnectivity() throws IOException {
} }
} }
} }
}
/** Validate the command list. */ /** Validate the command list. */
protected void validateCommands() { protected void validateCommands() {
@ -1502,7 +1501,7 @@ protected void close() throws IOException {
* the pack could not be unlocked. * the pack could not be unlocked.
*/ */
protected void release() throws IOException { protected void release() throws IOException {
walk.release(); walk.close();
unlockPack(); unlockPack();
timeoutIn = null; timeoutIn = null;
rawIn = null; rawIn = null;