Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update deps for spring-websocket

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-05-06 16:42:42 -04:00
parent e7f38e5b17
commit 37c6a94905
5 changed files with 22 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java
View File

@@ -22,6 +22,7 @@ import java.net.URI;
import java.util.Arrays;
import java.util.Random;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
@@ -102,7 +103,13 @@ public class GlassFishRequestUpgradeStrategy extends AbstractEndpointUpgradeStra
private boolean performUpgrade(HttpServletRequest request, HttpServletResponse response,
HttpHeaders headers, TyrusEndpoint tyrusEndpoint) throws IOException {
final TyrusHttpUpgradeHandler upgradeHandler = request.upgrade(TyrusHttpUpgradeHandler.class);
final TyrusHttpUpgradeHandler upgradeHandler;
try {
upgradeHandler = request.upgrade(TyrusHttpUpgradeHandler.class);
}
catch (ServletException e) {
throw new HandshakeFailureException("Unable to create UpgardeHandler", e);
}
Connection connection = createConnection(upgradeHandler, response);

9
spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java
View File

@@ -20,6 +20,7 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Collections;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.websocket.Endpoint;
import javax.websocket.server.ServerEndpointConfig;
@@ -55,7 +56,13 @@ public class TomcatRequestUpgradeStrategy extends AbstractEndpointUpgradeStrateg
Assert.isTrue(request instanceof ServletServerHttpRequest);
HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
WsHttpUpgradeHandler upgradeHandler = servletRequest.upgrade(WsHttpUpgradeHandler.class);
WsHttpUpgradeHandler upgradeHandler;
try {
upgradeHandler = servletRequest.upgrade(WsHttpUpgradeHandler.class);
}
catch (ServletException e) {
throw new HandshakeFailureException("Unable to create UpgardeHandler", e);
}
WsHandshakeRequest webSocketRequest = new WsHandshakeRequest(servletRequest);
try {