Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-06-18 14:05:27 +0000
committerJoakim Erdfelt2013-06-18 14:05:35 +0000
commita6ef027232aebcd6a19f70f87f102bb9cebc1576 (patch)
tree3accd1755a20a444b57bfbac5993ce8faa75b000
parent117b086f26581a31cd35d12e923cb7b805f180c0 (diff)
downloadorg.eclipse.jetty.project-a6ef027232aebcd6a19f70f87f102bb9cebc1576.tar.gz
org.eclipse.jetty.project-a6ef027232aebcd6a19f70f87f102bb9cebc1576.tar.xz
org.eclipse.jetty.project-a6ef027232aebcd6a19f70f87f102bb9cebc1576.zip
Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed
-rw-r--r--jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index badda0c084..fbbb0b5779 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -140,8 +140,12 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
{
try
{
- ServletUpgradeRequest sockreq = new ServletUpgradeRequest(request);
- ServletUpgradeResponse sockresp = new ServletUpgradeResponse(response);
+ // TODO: use ServletUpgradeRequest in Jetty 9.1
+ @SuppressWarnings("deprecation")
+ ServletWebSocketRequest sockreq = new ServletWebSocketRequest(request);
+ // TODO: use ServletUpgradeResponse in Jetty 9.1
+ @SuppressWarnings("deprecation")
+ ServletWebSocketResponse sockresp = new ServletWebSocketResponse(response);
WebSocketCreator creator = getCreator();

Back to the top