Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

2017-01-20 15:42:39 +01:00 · 2017-01-20 15:42:39 +01:00 · c7c183c370
parent ee17396cee acab5ef18e
commit c7c183c370
1 changed files with 2 additions and 0 deletions
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java
@ -40,6 +40,8 @@ public class ServletPathSpec extends PathSpec
    
    public ServletPathSpec(String servletPathSpec)
    {
+        if (servletPathSpec == null)
+            servletPathSpec = "";
        if (servletPathSpec.startsWith("servlet|"))
            servletPathSpec = servletPathSpec.substring("servlet|".length());
        assertValidServletPathSpec(servletPathSpec);