Access base directly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1655127 13f79535-47bb-0310-9956-ffa450edef68
Overruler · Jan 27, 2015 · 5611409 · 5611409
1 parent 12e4fff
commit 5611409
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -28,7 +28,6 @@
 public abstract class AbstractArchiveResource extends AbstractResource {
 
     private final AbstractArchiveResourceSet archiveResourceSet;
-    private final String base;
     private final String baseUrl;
     private final JarEntry resource;
     private final String codeBaseUrl;
@@ -37,11 +36,9 @@ public abstract class AbstractArchiveResource extends AbstractResource {
     private Certificate[] certificates;
 
     protected AbstractArchiveResource(AbstractArchiveResourceSet archiveResourceSet,
-            String webAppPath, String base, String baseUrl, JarEntry jarEntry,
-            String codeBaseUrl) {
+            String webAppPath, String baseUrl, JarEntry jarEntry, String codeBaseUrl) {
         super(archiveResourceSet.getRoot(), webAppPath);
         this.archiveResourceSet = archiveResourceSet;
-        this.base = base;
         this.baseUrl = baseUrl;
         this.resource = jarEntry;
         this.codeBaseUrl = codeBaseUrl;
@@ -65,7 +62,7 @@ protected AbstractArchiveResource(AbstractArchiveResourceSet archiveResourceSet,
     }
 
     protected final String getBase() {
-        return base;
+        return archiveResourceSet.getBase();
     }
 
     protected final String getBaseUrl() {

diff --git a/java/org/apache/catalina/webresources/JarResource.java b/java/org/apache/catalina/webresources/JarResource.java
@@ -33,9 +33,8 @@ public class JarResource extends AbstractArchiveResource {
     private static final Log log = LogFactory.getLog(JarResource.class);
 
     public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
-            String base, String baseUrl, JarEntry jarEntry) {
-        super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
-                baseUrl);
+            String baseUrl, JarEntry jarEntry) {
+        super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry, baseUrl);
     }
 
     @Override

diff --git a/java/org/apache/catalina/webresources/JarResourceSet.java b/java/org/apache/catalina/webresources/JarResourceSet.java
@@ -78,7 +78,7 @@ public JarResourceSet(WebResourceRoot root, String webAppMount, String base,
     @Override
     protected WebResource createArchiveResource(JarEntry jarEntry,
             String webAppPath, Manifest manifest) {
-        return new JarResource(this, webAppPath, getBase(), getBaseUrlString(), jarEntry);
+        return new JarResource(this, webAppPath, getBaseUrlString(), jarEntry);
     }
 
     //-------------------------------------------------------- Lifecycle methods

diff --git a/java/org/apache/catalina/webresources/JarWarResource.java b/java/org/apache/catalina/webresources/JarWarResource.java
@@ -36,8 +36,8 @@ public class JarWarResource extends AbstractArchiveResource {
     private final String archivePath;
 
     public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
-            String base, String baseUrl, JarEntry jarEntry, String archivePath) {
-        super(archiveResourceSet, webAppPath, base, "jar:war:" + baseUrl + "^/" + archivePath,
+            String baseUrl, JarEntry jarEntry, String archivePath) {
+        super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "^/" + archivePath,
                 jarEntry, "jar:" + baseUrl + "!/" + archivePath);
         this.archivePath = archivePath;
     }

diff --git a/java/org/apache/catalina/webresources/JarWarResourceSet.java b/java/org/apache/catalina/webresources/JarWarResourceSet.java
@@ -81,8 +81,7 @@ public JarWarResourceSet(WebResourceRoot root, String webAppMount,
     @Override
     protected WebResource createArchiveResource(JarEntry jarEntry,
             String webAppPath, Manifest manifest) {
-        return new JarWarResource(this, webAppPath, getBase(), getBaseUrlString(),
-                jarEntry, archivePath);
+        return new JarWarResource(this, webAppPath, getBaseUrlString(), jarEntry, archivePath);
     }
 
     //-------------------------------------------------------- Lifecycle methods