motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix file handle leak in FetchCommand#fetchSubmodules"

This commit is contained in:
Matthias Sohn 2018-01-04 06:45:00 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 21d22e6f63 67a8858b94
commit 992980d856
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java
View File

@ -171,7 +171,7 @@ private void fetchSubmodules(FetchResult results)
} }
walk.setTree(revWalk.parseTree(fetchHead)); walk.setTree(revWalk.parseTree(fetchHead));
while (walk.next()) { while (walk.next()) {
Repository submoduleRepo = walk.getRepository(); try (Repository submoduleRepo = walk.getRepository()) {
// Skip submodules that don't exist locally (have not been // Skip submodules that don't exist locally (have not been
// cloned), are not registered in the .gitmodules file, or // cloned), are not registered in the .gitmodules file, or
@ -184,15 +184,18 @@ private void fetchSubmodules(FetchResult results)
FetchRecurseSubmodulesMode recurseMode = getRecurseMode( FetchRecurseSubmodulesMode recurseMode = getRecurseMode(
walk.getPath()); walk.getPath());
// When the fetch mode is "yes" we always fetch. When the mode // When the fetch mode is "yes" we always fetch. When the
// is "on demand", we only fetch if the submodule's revision was // mode
// is "on demand", we only fetch if the submodule's revision
// was
// updated to an object that is not currently present in the // updated to an object that is not currently present in the
// submodule. // submodule.
if ((recurseMode == FetchRecurseSubmodulesMode.ON_DEMAND if ((recurseMode == FetchRecurseSubmodulesMode.ON_DEMAND
&& !submoduleRepo.hasObject(walk.getObjectId())) && !submoduleRepo.hasObject(walk.getObjectId()))
|| recurseMode == FetchRecurseSubmodulesMode.YES) { || recurseMode == FetchRecurseSubmodulesMode.YES) {
FetchCommand f = new FetchCommand(submoduleRepo) FetchCommand f = new FetchCommand(submoduleRepo)
.setProgressMonitor(monitor).setTagOpt(tagOption) .setProgressMonitor(monitor)
.setTagOpt(tagOption)
.setCheckFetchedObjects(checkFetchedObjects) .setCheckFetchedObjects(checkFetchedObjects)
.setRemoveDeletedRefs(isRemoveDeletedRefs()) .setRemoveDeletedRefs(isRemoveDeletedRefs())
.setThin(thin).setRefSpecs(refSpecs) .setThin(thin).setRefSpecs(refSpecs)
@ -205,6 +208,7 @@ private void fetchSubmodules(FetchResult results)
results.addSubmodule(walk.getPath(), f.call()); results.addSubmodule(walk.getPath(), f.call());
} }
} }
}
} catch (IOException e) { } catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e); throw new JGitInternalException(e.getMessage(), e);
} catch (ConfigInvalidException e) { } catch (ConfigInvalidException e) {