You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/09/06 10:27:21 UTC
[tomcat-jakartaee-migration] branch main updated: Tighten up the file name matching for manifests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 52e843d Tighten up the file name matching for manifests
52e843d is described below
commit 52e843db878b0512e750076b3a78165894dab6ac
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 6 11:27:15 2022 +0100
Tighten up the file name matching for manifests
---
src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java | 2 +-
src/test/java/org/apache/tomcat/jakartaee/ManifestConverterTest.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
index a0e5f13..19099c2 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ManifestConverter.java
@@ -39,7 +39,7 @@ public class ManifestConverter implements Converter {
@Override
public boolean accepts(String filename) {
- if (filename.endsWith(JarFile.MANIFEST_NAME)) {
+ if (filename.equals(JarFile.MANIFEST_NAME) || filename.endsWith("/" + JarFile.MANIFEST_NAME)) {
return true;
}
diff --git a/src/test/java/org/apache/tomcat/jakartaee/ManifestConverterTest.java b/src/test/java/org/apache/tomcat/jakartaee/ManifestConverterTest.java
index 68dc7da..6748dba 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/ManifestConverterTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/ManifestConverterTest.java
@@ -17,6 +17,7 @@
package org.apache.tomcat.jakartaee;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -29,5 +30,8 @@ public class ManifestConverterTest {
assertTrue(converter.accepts("META-INF/MANIFEST.MF"));
assertTrue(converter.accepts("WEB-INF/bundles/com.example.bundle/META-INF/MANIFEST.MF"));
+
+ assertFalse(converter.accepts("xMETA-INF/MANIFEST.MF"));
+ assertFalse(converter.accepts("WEB-INF/bundles/com.example.bundle/xMETA-INF/MANIFEST.MF"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org