From 25fb7cedd90c607c00144447eb95d9a86b0f7e71 Mon Sep 17 00:00:00 2001
From: Lauri Lehmijoki <lauri.lehmijoki@iki.fi>
Date: Tue, 3 Feb 2015 21:23:47 +0200
Subject: [PATCH] Null-check the result of File.listFiles

---
 src/main/scala/s3/website/model/push.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/s3/website/model/push.scala b/src/main/scala/s3/website/model/push.scala
index 1e37f15d..6db10746 100644
--- a/src/main/scala/s3/website/model/push.scala
+++ b/src/main/scala/s3/website/model/push.scala
@@ -128,7 +128,10 @@ object Upload {
 object Files {
   def recursiveListFiles(f: File): Seq[File] = {
     val these = f.listFiles
-    these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+    if (these != null)
+      these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+    else
+      Nil
   }
 
   def listSiteFiles(implicit site: Site, logger: Logger) = {