This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 8edddccaf5 Partial revert of 99d1d567
8edddccaf5 is described below
commit 8edddccaf515cdc2e90076945ddb14c5500ef79a
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Sep 30 13:28:00 2026 +0100
Partial revert of 99d1d567
"" is a valid URL pattern
---
.../org/apache/catalina/core/ApplicationServletRegistration.java | 2 +-
.../apache/catalina/core/TestApplicationServletRegistration.java | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationServletRegistration.java
b/java/org/apache/catalina/core/ApplicationServletRegistration.java
index 052092a090..f5bd7ebe72 100644
--- a/java/org/apache/catalina/core/ApplicationServletRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationServletRegistration.java
@@ -181,7 +181,7 @@ public class ApplicationServletRegistration implements
ServletRegistration.Dynam
String[] decodedUrlPatterns = new String[urlPatterns.length];
for (int i = 0; i < urlPatterns.length; i++) {
- if (urlPatterns[i] == null || urlPatterns[i].isEmpty()) {
+ if (urlPatterns[i] == null) {
throw new
IllegalArgumentException(sm.getString("applicationServletRegistration.nullUrlPattern"));
}
if (context.getUrlPatternsProvidedInDecodedForm()) {
diff --git
a/test/org/apache/catalina/core/TestApplicationServletRegistration.java
b/test/org/apache/catalina/core/TestApplicationServletRegistration.java
index b2b4a43cfb..bf56deca4e 100644
--- a/test/org/apache/catalina/core/TestApplicationServletRegistration.java
+++ b/test/org/apache/catalina/core/TestApplicationServletRegistration.java
@@ -55,7 +55,7 @@ public class TestApplicationServletRegistration extends
TomcatBaseTest {
@Test
- public void testAddMappingNullAndEmptyPatterns() {
+ public void testAddMappingNullPatterns() {
StandardContext context = new StandardContext();
Wrapper wrapper = context.createWrapper();
@@ -77,13 +77,6 @@ public class TestApplicationServletRegistration extends
TomcatBaseTest {
} catch (IllegalArgumentException e) {
// Expected
}
-
- try {
- registration.addMapping("");
- Assert.fail("Expected an IllegalArgumentException for an empty
pattern");
- } catch (IllegalArgumentException e) {
- // Expected
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
