You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/12/27 13:43:29 UTC
svn commit: r607061 -
/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Author: cziegeler
Date: Thu Dec 27 04:43:28 2007
New Revision: 607061
URL: http://svn.apache.org/viewvc?rev=607061&view=rev
Log:
getResourcePaths might return null.
Modified:
incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Modified: incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=607061&r1=607060&r2=607061&view=diff
==============================================================================
--- incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java (original)
+++ incubator/sling/trunk/launcher/webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java Thu Dec 27 04:43:28 2007
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -378,10 +379,13 @@
}
Set resources = servletContext.getResourcePaths(path); // unchecked
- if (resources.isEmpty()) {
+ if (resources == null || resources.isEmpty()) {
resources = servletContext.getResourcePaths(WEB_INF + path); // unchecked
}
+ if ( resources == null ) {
+ return Collections.EMPTY_LIST.iterator();
+ }
return resources.iterator(); // unchecked
}