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

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

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