Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null

This commit is contained in:
Jan Bartel 2013-03-26 10:55:37 +11:00
parent e553e2ec1f
commit af53d94b8b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
View File

@ -578,8 +578,14 @@ public class Scanner extends AbstractLifeCycle
if (f.isDirectory() && (depth<_scanDepth || _scanDepth==-1 || _scanDirs.contains(f))) if (f.isDirectory() && (depth<_scanDepth || _scanDepth==-1 || _scanDirs.contains(f)))
{ {
File[] files = f.listFiles(); File[] files = f.listFiles();
for (int i=0;i<files.length;i++) if (files != null)
scanFile(files[i], scanInfoMap,depth+1); {
for (int i=0;i<files.length;i++)
scanFile(files[i], scanInfoMap,depth+1);
}
else
LOG.warn("Error listing files in directory {}", f);
} }
} }
catch (IOException e) catch (IOException e)