Commits

Anonymous committed eaeb5a8

prevent NPEs when a URL is not a jar (jboss messing with our heads)

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@2043e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java

 
     private List<String> jar(URL location) throws IOException {
         URL url = URLUtil.normalizeToFileProtocol(location);
-        InputStream in = url.openStream();
-        try {
-            JarInputStream jarStream = new JarInputStream(in);
-            return jar(jarStream);
-        } finally {
-            in.close();
-        }
+        if (url != null) {
+            InputStream in = url.openStream();
+            try {
+                JarInputStream jarStream = new JarInputStream(in);
+                return jar(jarStream);
+            } finally {
+                in.close();
+            }
+        } else if (LOG.isDebugEnabled())
+            LOG.debug("Unable to read [#0]", location.toExternalForm());
+        
+        return Collections.emptyList();
     }
 
     private List<String> jar(JarInputStream jarStream) throws IOException {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.