Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

408118 - NullPointerException when parsing request cookies 

+ Added NPE guard for non-Jetty containers.
This commit is contained in:
Joakim Erdfelt 2013-05-21 11:33:38 -07:00
parent f403a1e185
commit dd3a918136
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
View File

@ -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();