opendev/gerrit
Code Issues Proposed changes

PrologCompiler: Fix NPEs when temp dir can't be listed

Browse Source 
Coverity-CID: 47579
Coverity-CID: 47580
Coverity-CID: 47581
Change-Id: I3681909b3ac1af8849f615055cf14b63a34ffbc2
This commit is contained in:
Dave Borowitz 2015-09-03 11:05:21 -04:00
parent 9e3fa80919
commit 89bc1eb083
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-pgm/src/main/java/com/google/gerrit/pgm/rules/PrologCompiler.java
View File

@ -262,14 +262,16 @@ public class PrologCompiler implements Callable<PrologCompiler.Status> {
}
}
private List<File> getAllFiles(File dir, String extension) {
private List<File> getAllFiles(File dir, String extension)
throws IOException {
ArrayList<File> fileList = new ArrayList<>();
getAllFiles(dir, extension, fileList);
return fileList;
}
private void getAllFiles(File dir, String extension, List<File> fileList) {
for (File f : dir.listFiles()) {
private void getAllFiles(File dir, String extension, List<File> fileList)
throws IOException {
for (File f : listFiles(dir)) {
if (f.getName().endsWith(extension)) {
fileList.add(f);
}
@ -279,14 +281,16 @@ public class PrologCompiler implements Callable<PrologCompiler.Status> {
}
}
private List<String> getRelativePaths(File dir, String extension) {
private List<String> getRelativePaths(File dir, String extension)
throws IOException {
ArrayList<String> pathList = new ArrayList<>();
getRelativePaths(dir, extension, "", pathList);
return pathList;
}
private void getRelativePaths(File dir, String extension, String path, List<String> pathList) {
for (File f : dir.listFiles()) {
private static void getRelativePaths(File dir, String extension, String path,
List<String> pathList) throws IOException {
for (File f : listFiles(dir)) {
if (f.getName().endsWith(extension)) {
pathList.add(path + f.getName());
}
@ -296,8 +300,8 @@ public class PrologCompiler implements Callable<PrologCompiler.Status> {
}
}
private void deleteAllFiles(File dir) {
for (File f : dir.listFiles()) {
private static void deleteAllFiles(File dir) throws IOException {
for (File f : listFiles(dir)) {
if (f.isDirectory()) {
deleteAllFiles(f);
} else {
@ -306,4 +310,12 @@ public class PrologCompiler implements Callable<PrologCompiler.Status> {
}
dir.delete();
}
private static File[] listFiles(File dir) throws IOException {
File[] files = dir.listFiles();
if (files == null) {
throw new IOException("Failed to list directory: " + dir);
}
return files;
}
}