Author: markt
Date: Fri Apr 27 10:01:55 2018
New Revision: 1830325
URL: http://svn.apache.org/viewvc?rev=1830325&view=rev
Log:
Correctly list resources in JAR files when directories do not have dedicated
entries.
Patch provided by Meelis Müür.
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=1830325&r1=1830324&r2=1830325&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Fri Apr 27 10:01:55 2018
@@ -133,15 +133,12 @@ public abstract class AbstractArchiveRes
}
for (String name : getArchiveEntries(false).keySet()) {
- if (name.length() > pathInJar.length() &&
- name.startsWith(pathInJar)) {
+ if (name.length() > pathInJar.length() &&
name.startsWith(pathInJar)) {
int nextSlash = name.indexOf('/', pathInJar.length());
- if (nextSlash == -1 || nextSlash == name.length() - 1) {
- if (name.startsWith(pathInJar)) {
- result.add(webAppMount + '/' +
-
name.substring(getInternalPath().length()));
- }
+ if (nextSlash != -1 && nextSlash != name.length() - 1) {
+ name = name.substring(0, nextSlash + 1);
}
+ result.add(webAppMount + '/' +
name.substring(getInternalPath().length()));
}
}
} else {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1830325&r1=1830324&r2=1830325&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 27 10:01:55 2018
@@ -82,6 +82,10 @@
under a <code>SecurityManager</code> when authentication is not
mandatory. (markt)
</fix>
+ <fix>
+ <bug>62329</bug>: Correctly list resources in JAR files when
directories
+ do not have dedicated entries. Patch provided by Meelis Müür. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
