From e272907594ae2bdc7ae8daefae0a9b4778d93e4b Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 27 Oct 2011 16:17:49 +0000
Subject: #7698 FileSystemContainer throws NPE when a directory cannot be read

svn changeset:21816/svn branch:6.7
---
 src/com/vaadin/data/util/FilesystemContainer.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com')

diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java
index a26323f487..76a7b90376 100644
--- a/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/src/com/vaadin/data/util/FilesystemContainer.java
@@ -395,6 +395,11 @@ public class FilesystemContainer implements Container.Hierarchical {
         } else {
             l = f.listFiles();
         }
+        if (l == null) {
+            // File.listFiles returns null if File does not exist or if there
+            // was an IO error (permission denied)
+            return;
+        }
         final List<File> ll = Arrays.asList(l);
         Collections.sort(ll);
 
-- 
cgit v1.2.3