Author: markt
Date: Fri Aug 16 13:03:04 2013
New Revision: 1514689
URL: http://svn.apache.org/r1514689
Log:
Back-porting JSR-356
Need to cast to Tomcat's request object to access upgrade method
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1514689&r1=1514688&r2=1514689&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Fri Aug 16 13:03:04 2013
@@ -40,6 +40,7 @@ import javax.websocket.Extension;
import javax.websocket.HandshakeResponse;
import javax.websocket.server.ServerEndpointConfig;
+import org.apache.catalina.connector.Request;
import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.websocket.Constants;
import org.apache.tomcat.websocket.WsHandshakeResponse;
@@ -172,7 +173,7 @@ public class UpgradeUtil {
}
WsHttpUpgradeHandler wsHandler =
- req.upgrade(WsHttpUpgradeHandler.class);
+ ((Request) req).upgrade(WsHttpUpgradeHandler.class);
wsHandler.preInit(ep, sec, sc, wsRequest, subProtocol,
pathParams, req.isSecure());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
