From 9653d74caee8bf8f3a7d032c313fe7d7c245a20a Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Fri, 20 Jan 2017 15:41:41 +0100
Subject: [PATCH] Issue #1229 - ClassLoader constraint issue when using
 NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.

Guarded against NPE.
---
 .../java/org/eclipse/jetty/http/pathmap/ServletPathSpec.java    | 2 ++
 1 file changed, 2 insertions(+)

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
index 8daeaa7599b..16b21e25331 100644
--- 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
@@ -24,6 +24,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);