Author: markt
Date: Fri Mar 4 14:09:45 2016
New Revision: 1733597
URL: http://svn.apache.org/viewvc?rev=1733597&view=rev
Log:
Correct back-port of fix for BZ 59001 in r1733184. Restore paths to files in
JARs when constructing URLs.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1733597&r1=1733596&r2=1733597&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Fri Mar 4 14:09:45 2016
@@ -1502,7 +1502,7 @@ public abstract class WebappClassLoaderB
if (jarEntry != null) {
try {
String jarFakeUrl =
getURI(jarRealFiles[i]).toString();
- result.add(UriUtil.buildJarUrl(jarFakeUrl));
+ result.add(UriUtil.buildJarUrl(jarFakeUrl, name));
} catch (MalformedURLException e) {
// Ignore
}
@@ -3314,7 +3314,7 @@ public abstract class WebappClassLoaderB
entry = new ResourceEntry();
try {
entry.codeBase = getURI(jarRealFiles[i]);
- entry.source =
UriUtil.buildJarUrl(entry.codeBase.toString());
+ entry.source =
UriUtil.buildJarUrl(entry.codeBase.toString(), path);
entry.lastModified =
jarRealFiles[i].lastModified();
} catch (MalformedURLException e) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
