Browse Source

Use try-with-resources in SubmoduleWalk

Convert try finally block to try-with-resources
Change-Id: Ifd676a2aba3e926bd2f3b6b8fefd5f63564899ed
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.4.0.201905081430-m2
Carsten Hammer 5 years ago
parent
commit
39b0b51b12
1 changed files with 12 additions and 14 deletions
  1. 12
    14
      org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java

+ 12
- 14
org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java View File

@@ -149,21 +149,20 @@ public class SubmoduleWalk implements AutoCloseable {
*/
public static SubmoduleWalk forPath(Repository repository,
AnyObjectId treeId, String path) throws IOException {
SubmoduleWalk generator = new SubmoduleWalk(repository);
try {
try (SubmoduleWalk generator = new SubmoduleWalk(repository)) {
generator.setTree(treeId);
PathFilter filter = PathFilter.create(path);
generator.setFilter(filter);
generator.setRootTree(treeId);
while (generator.next())
if (filter.isDone(generator.walk))
while (generator.next()) {
if (filter.isDone(generator.walk)) {
return generator;
}
}
return null;
} catch (IOException e) {
generator.close();
throw e;
}
generator.close();
return null;
}

/**
@@ -182,21 +181,20 @@ public class SubmoduleWalk implements AutoCloseable {
*/
public static SubmoduleWalk forPath(Repository repository,
AbstractTreeIterator iterator, String path) throws IOException {
SubmoduleWalk generator = new SubmoduleWalk(repository);
try {
try (SubmoduleWalk generator = new SubmoduleWalk(repository)) {
generator.setTree(iterator);
PathFilter filter = PathFilter.create(path);
generator.setFilter(filter);
generator.setRootTree(iterator);
while (generator.next())
if (filter.isDone(generator.walk))
while (generator.next()) {
if (filter.isDone(generator.walk)) {
return generator;
}
}
return null;
} catch (IOException e) {
generator.close();
throw e;
}
generator.close();
return null;
}

/**

Loading…
Cancel
Save