opendev/gerrit
Code Issues Proposed changes

LibraryDownloader: Don't leak DirectoryStream

Browse Source 
Change-Id: I6941ac6470c75f3d99247f909cb1328a837524a7
This commit is contained in:
Dave Borowitz
2015-02-24 12:36:44 -08:00
committed by David Pursehouse
parent 62e67bede7
commit c9cc436cd6
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
View File

@@ -216,19 +216,15 @@ class LibraryDownloader {
private void removeStaleVersions() { private void removeStaleVersions() {
if (!Strings.isNullOrEmpty(remove)) { if (!Strings.isNullOrEmpty(remove)) {
Iterable<Path> paths; DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
try {
paths = Files.newDirectoryStream(lib_dir,
new DirectoryStream.Filter<Path>() {
@Override @Override
public boolean accept(Path entry) { public boolean accept(Path entry) {
return entry.getFileName().toString() return entry.getFileName().toString()
.matches("^" + remove + "$"); .matches("^" + remove + "$");
} }
}); };
} catch (IOException e) { try (DirectoryStream<Path> paths =
throw new Die("cannot remove stale library versions", e); Files.newDirectoryStream(lib_dir, filter)) {
}
for (Path p : paths) { for (Path p : paths) {
String old = p.getFileName().toString(); String old = p.getFileName().toString();
String bak = "." + old + ".backup"; String bak = "." + old + ".backup";
@@ -239,6 +235,9 @@ class LibraryDownloader {
throw new Die("cannot rename " + old, e); throw new Die("cannot rename " + old, e);
} }
} }
} catch (IOException e) {
throw new Die("cannot remove stale library versions", e);
}
} }
} }