Author: violetagg
Date: Fri Oct 23 08:12:47 2015
New Revision: 1710134
URL: http://svn.apache.org/viewvc?rev=1710134&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58490
Fix NPE when searching for SCIs in case the web app is not extracted
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1710134&r1=1710133&r2=1710134&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Fri
Oct 23 08:12:47 2015
@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
import javax.servlet.ServletContext;
import org.apache.catalina.Context;
+import org.apache.tomcat.util.scan.JarFactory;
/**
* A variation of Java's JAR ServiceLoader that respects exclusion rules for
@@ -112,7 +113,7 @@ public class WebappServiceLoader<T> {
if (base.endsWith("/")) {
url = new URL(base + configFile);
} else {
- url = new URL("jar:" + base + "!/" + configFile);
+ url = JarFactory.getJarEntryURL(jarUrl, configFile);
}
try {
parseConfigFile(applicationServicesFound, url);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
