Merge pull request #11 from jbwyme/master

Fix NullPointerException when retrieving resource paths
codedance · Feb 3, 2013 · 0f8c2e3 · 0f8c2e3
2 parents 16b9c4e + a25ec29
commit 0f8c2e3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/com/papercut/silken/WebAppFileSetResolver.java b/src/main/java/com/papercut/silken/WebAppFileSetResolver.java
@@ -93,12 +93,14 @@ private List<URL> listResourcesFromWebDir(String base, String namespace, String
         Set<String> files = (Set<String>) servletContext.getResourcePaths(path.toString());
 
         List<URL> resourceList = new ArrayList<URL>();
-        for (String file : files) {
-            if (file.endsWith(suffix)) {
-                try {
-                    resourceList.add(servletContext.getResource(file));
-                } catch (MalformedURLException e) {
-                    throw new RuntimeException("Unable to resolve resource at: " + file, e);
+        if (files != null) {
+            for (String file : files) {
+                if (file.endsWith(suffix)) {
+                    try {
+                        resourceList.add(servletContext.getResource(file));
+                    } catch (MalformedURLException e) {
+                        throw new RuntimeException("Unable to resolve resource at: " + file, e);
+                    }
                 }
             }
         }