Issue #7891 - Correct no-match NativeWebSocketConfiguration condition

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · May 4, 2022 · 6c2968a · 6c2968a
1 parent 0cb102c
commit 6c2968a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java b/...server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java
@@ -22,6 +22,7 @@
 import javax.servlet.ServletContext;
 
 import org.eclipse.jetty.http.pathmap.MappedResource;
+import org.eclipse.jetty.http.pathmap.MatchedResource;
 import org.eclipse.jetty.http.pathmap.PathMappings;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.http.pathmap.RegexPathSpec;
@@ -82,7 +83,10 @@ public WebSocketServerFactory getFactory()
      */
     public MappedResource<WebSocketCreator> getMatch(String target)
     {
-        return this.mappings.getMatched(target).getMappedResource();
+        MatchedResource<WebSocketCreator> matched = this.mappings.getMatched(target);
+        if (matched == null)
+            return null;
+        return matched.getMappedResource();
     }
 
     /**