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

Merge pull request #2393 from eclipse/jetty-9.4.x-issue-2337-ws-subprotocols 

Issue #2337 - slightly more efficient getSubProtocols() behavior
This commit is contained in:
Joakim Erdfelt 2018-04-04 06:22:17 -05:00 committed by GitHub
parent 9147e408c8 8bf695bf49
commit 2b32f82aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/ServletUpgradeRequest.java
View File

@ -18,13 +18,10 @@
package org.eclipse.jetty.websocket.servlet;
import java.io.UnsupportedEncodingException;
import java.net.HttpCookie;
import java.net.InetSocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@ -56,7 +53,6 @@ public class ServletUpgradeRequest implements UpgradeRequest
private final boolean secure;
private List<HttpCookie> cookies;
private Map<String, List<String>> parameterMap;
private List<String> subprotocols;
public ServletUpgradeRequest(HttpServletRequest httpRequest) throws URISyntaxException
{
@ -387,20 +383,21 @@ public class ServletUpgradeRequest implements UpgradeRequest
@Override
public List<String> getSubProtocols()
{
if (subprotocols == null)
Enumeration<String> requestProtocols = request.getHeaders("Sec-WebSocket-Protocol");
if (requestProtocols != null && requestProtocols.hasMoreElements())
{
Enumeration<String> requestProtocols = request.getHeaders("Sec-WebSocket-Protocol");
if (requestProtocols != null)
ArrayList subprotocols = new ArrayList<>(2);
while (requestProtocols.hasMoreElements())
{
subprotocols = new ArrayList<>(2);
while (requestProtocols.hasMoreElements())
{
String candidate = requestProtocols.nextElement();
Collections.addAll(subprotocols,parseProtocols(candidate));
}
String candidate = requestProtocols.nextElement();
Collections.addAll(subprotocols,parseProtocols(candidate));
}
return subprotocols;
}
else
{
return Collections.emptyList();
}
return subprotocols;
}
/**