Author: markt Date: Thu Jul 2 18:40:23 2015 New Revision: 1688878 URL: http://svn.apache.org/r1688878 Log: Pull up manifest
Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java 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=1688878&r1=1688877&r2=1688878&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java Thu Jul 2 18:40:23 2015 @@ -37,21 +37,12 @@ public abstract class AbstractArchiveRes private final HashMap<String,JarEntry> jarFileEntries = new HashMap<>(); private URL baseUrl; private String baseUrlString; - private Manifest manifest; private JarFile archive = null; private final Object archiveLock = new Object(); private long archiveUseCount = 0; - protected final void setManifest(Manifest manifest) { - this.manifest = manifest; - } - - protected final Manifest getManifest() { - return manifest; - } - protected final void setBaseUrl(URL baseUrl) { this.baseUrl = baseUrl; if (baseUrl == null) { @@ -250,7 +241,7 @@ public abstract class AbstractArchiveRes if (jarEntry == null) { return new EmptyResource(root, path); } else { - return createArchiveResource(jarEntry, path, manifest); + return createArchiveResource(jarEntry, path, getManifest()); } } } else { Modified: tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1688878&r1=1688877&r2=1688878&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java Thu Jul 2 18:40:23 2015 @@ -16,6 +16,8 @@ */ package org.apache.catalina.webresources; +import java.util.jar.Manifest; + import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; import org.apache.catalina.WebResourceRoot; @@ -32,6 +34,7 @@ public abstract class AbstractResourceSe private String webAppMount; private boolean classLoaderOnly; private boolean staticOnly; + private Manifest manifest; protected static final StringManager sm = @@ -111,6 +114,14 @@ public abstract class AbstractResourceSe this.staticOnly = staticOnly; } + protected final void setManifest(Manifest manifest) { + this.manifest = manifest; + } + + protected final Manifest getManifest() { + return manifest; + } + //-------------------------------------------------------- Lifecycle methods @Override --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org