This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new fc761db Harmonize StandardJarScanner extraction of JAR name
fc761db is described below
commit fc761dbf2f56b538ed42febda0b3a518469adf01
Author: remm <r...@apache.org>
AuthorDate: Fri Apr 9 10:24:19 2021 +0200
Harmonize StandardJarScanner extraction of JAR name
From 8.5 code.
---
java/org/apache/tomcat/util/scan/StandardJarScanner.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index b27f40b..965b69d 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -359,7 +359,7 @@ public class StandardJarScanner implements JarScanner {
String name = null;
String path = url.getPath();
- int end = path.indexOf(Constants.JAR_EXT);
+ int end = path.lastIndexOf(Constants.JAR_EXT);
if (end != -1) {
int start = path.lastIndexOf('/', end);
name = path.substring(start + 1, end + 4);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 875a339..54255ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.109 (violetagg)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>65226</bug>: Fix extraction of JAR name in some cases in
+ StandardJarScanner. Submitted by Lynx. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
