408118 - NullPointerException when parsing request cookies

+ Added NPE guard for non-Jetty containers.

1 files changed, 10 insertions, 6 deletions

diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
index c1dda2c3d5..44094eed40 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
@@ -53,14 +53,18 @@ public class ServletWebSocketRequest extends UpgradeRequest
         super.setParameterMap(request.getParameterMap());
 
         // Copy Cookies
-        List<HttpCookie> cookies = new ArrayList<>();
-        for (Cookie rcookie : request.getCookies())
+        Cookie rcookies[] = request.getCookies();
+        if (rcookies != null)
         {
-            HttpCookie hcookie = new HttpCookie(rcookie.getName(),rcookie.getValue());
-            // no point handling domain/path/expires/secure/httponly on client request cookies
-            cookies.add(hcookie);
+            List<HttpCookie> cookies = new ArrayList<>();
+            for (Cookie rcookie : rcookies)
+            {
+                HttpCookie hcookie = new HttpCookie(rcookie.getName(),rcookie.getValue());
+                // no point handling domain/path/expires/secure/httponly on client request cookies
+                cookies.add(hcookie);
+            }
+            super.setCookies(cookies);
         }
-        super.setCookies(cookies);
 
         // Copy Headers
         Enumeration<String> headerNames = request.getHeaderNames();