This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2fb3864f0e1c08982d6e17ceea2712c0cebc22f9 Author: remm <[email protected]> AuthorDate: Wed Sep 30 12:17:53 2026 +0200 jakarta -> javax and fix test --- java/org/apache/catalina/core/ApplicationServletRegistration.java | 2 +- test/org/apache/catalina/core/TestApplicationServletRegistration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/core/ApplicationServletRegistration.java b/java/org/apache/catalina/core/ApplicationServletRegistration.java index 01805aa8f6..ae2d63f7bd 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) { + if (urlPatterns[i] == null || urlPatterns[i].isEmpty()) { 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 8cb90c3257..0a91e98885 100644 --- a/test/org/apache/catalina/core/TestApplicationServletRegistration.java +++ b/test/org/apache/catalina/core/TestApplicationServletRegistration.java @@ -16,7 +16,7 @@ */ package org.apache.catalina.core; -import jakarta.servlet.ServletRegistration; +import javax.servlet.ServletRegistration; import org.junit.Assert; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
