Merge pull request #11511 from jetty/fix/12.0.x/classmatcher-match-npe

Issue #11510 - Prevent NPE in ClassMatcher.match()
jetty · Mar 13, 2024 · d07d13f · d07d13f
2 parents c05ae3b + c2d0ab2
commit d07d13f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/ClassMatcher.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/ClassMatcher.java
@@ -751,6 +751,9 @@ public boolean match(Class<?> clazz)
 
     public boolean match(String name, URL url)
     {
+        if (url == null)
+            return false;
+
         // Strip class suffix for name matching
         if (name.endsWith(".class"))
             name = name.substring(0, name.length() - 6);

diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/ClassMatcher.java b/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/ClassMatcher.java
@@ -733,6 +733,9 @@ public boolean match(Class<?> clazz)
 
     public boolean match(String name, URL url)
     {
+        if (url == null)
+            return false;
+
         // Strip class suffix for name matching
         if (name.endsWith(".class"))
             name = name.substring(0, name.length() - 6);