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

Fix failing test

Browse Source 
Issue: SPR-10800
This commit is contained in:
Rossen Stoyanchev
2013-07-31 22:06:15 -04:00
parent ad40ecff4b
commit dcf7813de8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java
View File

@@ -24,6 +24,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.WebSocketSession;
@@ -45,12 +46,13 @@ public abstract class AbstractHttpReceivingTransportHandler
@Override
public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
WebSocketHandler webSocketHandler, WebSocketSession webSocketSession) throws SockJsProcessingException {
WebSocketHandler wsHandler, WebSocketSession wsSession) throws SockJsProcessingException {
// TODO: check "Sec-WebSocket-Protocol" header
// https://github.com/sockjs/sockjs-client/issues/130
handleRequestInternal(request, response, webSocketHandler, webSocketSession);
Assert.notNull(wsSession, "No session");
handleRequestInternal(request, response, wsHandler, wsSession);
}
protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,