405526 Deployment must fail if more than 1 servlet maps to same url pattern

1 files changed, 5 insertions, 1 deletions

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index 79a73851a4..1132ac09ca 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -1278,7 +1278,11 @@ public class ServletHandler extends ScopedHandler
                     String[] pathSpecs = servletmapping.getPathSpecs();
                     for (String pathSpec : pathSpecs)
                         if (pathSpec != null)
-                            pm.put(pathSpec, servlet_holder);
+                        {
+                            ServletHolder previous = pm.put(pathSpec, servlet_holder);
+                            if (previous != null)
+                                throw new IllegalStateException("Multiple servlets map to path: "+pathSpec);
+                        }
                 }
             }