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

2017-01-20 15:43:01 +01:00 · 2017-01-20 15:43:01 +01:00 · db3b0550a2
parent 84b57c5f07 c7c183c370
commit db3b0550a2
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);