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

jetty · Jan 20, 2017 · c7c183c · c7c183c
2 parents ee17396 + acab5ef
commit c7c183c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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 static String normalize(String pathSpec)
 
     public ServletPathSpec(String servletPathSpec)
     {
+        if (servletPathSpec == null)
+            servletPathSpec = "";
         if (servletPathSpec.startsWith("servlet|"))
             servletPathSpec = servletPathSpec.substring("servlet|".length());
         assertValidServletPathSpec(servletPathSpec);