Merge pull request #8 from ReactiveX/stevegury-recursivefilelist

MacOSX WatchService check for null file in recursiveListFiles
ReactiveX · Aug 26, 2015 · 46a740b · 46a740b
2 parents ba043ff + 87a68e4
commit 46a740b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/barbarysoftware/watchservice/MacOSXListeningWatchService.java b/src/main/java/com/barbarysoftware/watchservice/MacOSXListeningWatchService.java
@@ -110,10 +110,12 @@ private Map<File, Long> createLastModifiedMap(File file) {
 
     private static Set<File> recursiveListFiles(File file) {
         Set<File> files = new HashSet<File>();
-        files.add(file);
-        if (file.isDirectory()) {
-            for (File child : file.listFiles()) {
-                files.addAll(recursiveListFiles(child));
+        if (file != null) {
+            files.add(file);
+            if (file.isDirectory()) {
+                for (File child : file.listFiles()) {
+                    files.addAll(recursiveListFiles(child));
+                }
             }
         }
         return files;