Author: markt Date: Tue Jan 27 19:36:26 2015 New Revision: 1655124 URL: http://svn.apache.org/r1655124 Log: Internal path always refers to the ResourceSet so access it form their directly.
Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java Tue Jan 27 19:36:26 2015 @@ -38,7 +38,7 @@ public abstract class AbstractArchiveRes protected AbstractArchiveResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, String base, String baseUrl, JarEntry jarEntry, - String internalPath, Manifest manifest, String codeBaseUrl) { + Manifest manifest, String codeBaseUrl) { super(archiveResourceSet.getRoot(), webAppPath); this.base = base; this.baseUrl = baseUrl; @@ -50,6 +50,7 @@ public abstract class AbstractArchiveRes if (resourceName.charAt(resourceName.length() - 1) == '/') { resourceName = resourceName.substring(0, resourceName.length() - 1); } + String internalPath = archiveResourceSet.getInternalPath(); if (internalPath.length() > 0 && resourceName.equals( internalPath.subSequence(1, internalPath.length()))) { name = ""; Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan 27 19:36:26 2015 @@ -34,9 +34,8 @@ public class JarResource extends Abstrac private static final Log log = LogFactory.getLog(JarResource.class); public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, - String base, String baseUrl, JarEntry jarEntry, String internalPath, - Manifest manifest) { - super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry, internalPath, + String base, String baseUrl, JarEntry jarEntry, Manifest manifest) { + super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry, manifest, baseUrl); } Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655124&r1=1655123&r2=1655124&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Tue Jan 27 19:36:26 2015 @@ -79,7 +79,7 @@ public class JarResourceSet extends Abst protected WebResource createArchiveResource(JarEntry jarEntry, String webAppPath, Manifest manifest) { return new JarResource(this, webAppPath, getBase(), getBaseUrlString(), - jarEntry, getInternalPath(), manifest); + jarEntry, manifest); } //-------------------------------------------------------- Lifecycle methods Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1655124&r1=1655123&r2=1655124&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue Jan 27 19:36:26 2015 @@ -37,10 +37,9 @@ public class JarWarResource extends Abst private final String archivePath; public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, - String base, String baseUrl, JarEntry jarEntry, String archivePath, - String internalPath, Manifest manifest) { + String base, String baseUrl, JarEntry jarEntry, String archivePath, Manifest manifest) { super(archiveResourceSet, webAppPath, base, "jar:war:" + baseUrl + "^/" + archivePath, - jarEntry, internalPath, manifest, "jar:" + baseUrl + "!/" + archivePath); + jarEntry, manifest, "jar:" + baseUrl + "!/" + archivePath); this.archivePath = archivePath; } Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1655124&r1=1655123&r2=1655124&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java Tue Jan 27 19:36:26 2015 @@ -82,7 +82,7 @@ public class JarWarResourceSet extends A protected WebResource createArchiveResource(JarEntry jarEntry, String webAppPath, Manifest manifest) { return new JarWarResource(this, webAppPath, getBase(), getBaseUrlString(), - jarEntry, archivePath, getInternalPath(), manifest); + jarEntry, archivePath, manifest); } //-------------------------------------------------------- Lifecycle methods --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org