Author: markt Date: Mon Feb 10 15:42:05 2014 New Revision: 1566661 URL: http://svn.apache.org/r1566661 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56125 Correctly construct the URL for a resource that represents the root of a JAR file.
Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1566661&r1=1566660&r2=1566661&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java Mon Feb 10 15:42:05 2014 @@ -219,7 +219,7 @@ public abstract class AbstractArchiveRes if (pathInJar.equals("")) { // Special case return new JarResourceRoot(root, new File(getBase()), - pathInJar, path); + baseUrlString, path); } else { JarEntry jarEntry = null; if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) { Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1566661&r1=1566660&r2=1566661&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 10 15:42:05 2014 @@ -52,6 +52,10 @@ web application class loader to add external resources to the web application. (markt) </fix> + <fix> + <bug>56125</bug>: Correctly construct the URL for a resource that + represents the root of a JAR file. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org