From 374419a4ea1c98d26c0b2caa396aa7740bdee831 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Sun, 31 Dec 2017 15:19:27 +0100
Subject: [PATCH] File.listFiles() can return null, Arrays.asList does not
 accept null input

---
 src/com/sheepit/client/Configuration.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/sheepit/client/Configuration.java b/src/com/sheepit/client/Configuration.java
index 518c908..1de4328 100644
--- a/src/com/sheepit/client/Configuration.java
+++ b/src/com/sheepit/client/Configuration.java
@@ -346,10 +346,16 @@ public class Configuration {
 		List<File> files_local = new LinkedList<File>();
 		List<File> files = new LinkedList<File>();
 		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) {
-			files.addAll(Arrays.asList(this.storageDirectory.listFiles()));
+			File[] filesInDirectory = this.storageDirectory.listFiles();
+			if (filesInDirectory != null) {
+				files.addAll(Arrays.asList(filesInDirectory));
+			}
 		}
 		
 		for (File file : files) {