Issue #6654 - Fix NPEs from bad Servlet API use

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Aug 23, 2021 · 32e6698 · 32e6698
1 parent 401f195
commit 32e6698
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...re-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java b/...re-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
@@ -98,6 +98,10 @@ public List<HttpCookie> getCookies()
                     .map(c -> new HttpCookie(c.getName(), c.getValue()))
                     .collect(Collectors.toList());
             }
+            else
+            {
+                cookies = List.of();
+            }
         }
 
         return cookies;