Author: remy.maucherat(a)jboss.com Date: 2014-10-07 11:34:13 -0400 (Tue, 07 Oct 2014) New Revision: 2521 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Log: Port cosmetic use of constants from Tomcat. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-10-07 06:07:54 UTC (rev 2520) +++ branches/7.5.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2014-10-07 15:34:13 UTC (rev 2521) @@ -115,7 +115,7 @@ } // Sub-protocols List<String> subProtocols = getTokensFromHeader(req, - "Sec-WebSocket-Protocol"); + Constants.WS_PROTOCOL_HEADER_NAME); subProtocol = sec.getConfigurator().getNegotiatedSubprotocol( sec.getSubprotocols(), subProtocols); @@ -123,7 +123,7 @@ // Should normally only be one header but handle the case of multiple // headers List<Extension> extensionsRequested = new ArrayList<Extension>(); - Enumeration<String> extHeaders = req.getHeaders("Sec-WebSocket-Extensions"); + Enumeration<String> extHeaders = req.getHeaders(Constants.WS_EXTENSIONS_HEADER_NAME); while (extHeaders.hasMoreElements()) { Util.parseExtensionHeader(extensionsRequested, extHeaders.nextElement()); }