Upgrade spring-websocket to Jetty 9.0.4

Author: rstoyanchev

build.gradle

@@ -480,11 +480,11 @@ project("spring-websocket") {
 		}
 		optional("org.glassfish.tyrus:tyrus-websocket-core:1.0")
 		optional("org.glassfish.tyrus:tyrus-container-servlet:1.0")
-		optional("org.eclipse.jetty:jetty-webapp:9.0.3.v20130506") {
+		optional("org.eclipse.jetty:jetty-webapp:9.0.4.v20130625") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
 		}
-		optional("org.eclipse.jetty.websocket:websocket-server:9.0.3.v20130506")
-		optional("org.eclipse.jetty.websocket:websocket-client:9.0.3.v20130506")
+		optional("org.eclipse.jetty.websocket:websocket-server:9.0.4.v20130625")
+		optional("org.eclipse.jetty.websocket:websocket-client:9.0.4.v20130625")
 		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0") // required for SockJS support currently
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java

@@ -24,8 +24,8 @@
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.server.HandshakeRFC6455;
-import org.eclipse.jetty.websocket.server.ServletWebSocketRequest;
 import org.eclipse.jetty.websocket.server.WebSocketServerFactory;
+import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
 import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
@@ -67,8 +67,8 @@ public JettyRequestUpgradeStrategy() {
 		this.factory.setCreator(new WebSocketCreator() {
 			@Override
 			public Object createWebSocket(UpgradeRequest request, UpgradeResponse response) {
-				Assert.isInstanceOf(ServletWebSocketRequest.class, request);
-				return ((ServletWebSocketRequest) request).getServletAttributes().get(WEBSOCKET_LISTENER_ATTR_NAME);
+				Assert.isInstanceOf(ServletUpgradeRequest.class, request);
+				return ((ServletUpgradeRequest) request).getServletAttributes().get(WEBSOCKET_LISTENER_ATTR_NAME);
 			}
 		});
 		try {