Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

File.listFiles() can return null, Arrays.asList does not accept null input

Browse Source
This commit is contained in:
Laurent Clouet
2017-12-31 15:19:27 +01:00
parent 3f52082e4e
commit 374419a4ea
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/sheepit/client/Configuration.java
View File

@@ -346,10 +346,16 @@ public class Configuration {
List<File> files_local = new LinkedList<File>(); List<File> files_local = new LinkedList<File>();
List<File> files = new LinkedList<File>(); List<File> files = new LinkedList<File>();
if (this.workingDirectory != null) { if (this.workingDirectory != null) {
files.addAll(Arrays.asList(this.workingDirectory.listFiles())); File[] filesInDirectory = this.workingDirectory.listFiles();
if (filesInDirectory != null) {
files.addAll(Arrays.asList(filesInDirectory));
}
} }
if (this.storageDirectory != null) { if (this.storageDirectory != null) {
files.addAll(Arrays.asList(this.storageDirectory.listFiles())); File[] filesInDirectory = this.storageDirectory.listFiles();
if (filesInDirectory != null) {
files.addAll(Arrays.asList(filesInDirectory));
}
} }
for (File file : files) { for (File file : files) {