root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix left-over merge issue from previous commit

This commit is contained in:
Rossen Stoyanchev 2014-07-09 00:46:06 -04:00
parent 48236be4a2
commit bc62d63fdd
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
View File

@ -314,9 +314,6 @@ public abstract class AbstractSockJsService implements SockJsService {
String serverId = pathSegments[0]; String serverId = pathSegments[0];
String sessionId = pathSegments[1]; String sessionId = pathSegments[1];
String transport = pathSegments[2]; String transport = pathSegments[2];
<<<<<<< HEAD
if (!validateRequest(serverId, sessionId, transport)) {
=======
if (!isWebSocketEnabled() && transport.equals("websocket")) { if (!isWebSocketEnabled() && transport.equals("websocket")) {
logger.debug("WebSocket transport is disabled, ignoring " + requestInfo); logger.debug("WebSocket transport is disabled, ignoring " + requestInfo);
@ -325,7 +322,6 @@ public abstract class AbstractSockJsService implements SockJsService {
} }
else if (!validateRequest(serverId, sessionId, transport)) { else if (!validateRequest(serverId, sessionId, transport)) {
logger.error("Ignoring transport request " + requestInfo); logger.error("Ignoring transport request " + requestInfo);
>>>>>>> STOMP and WebSocket messaging related logging updates
response.setStatusCode(HttpStatus.NOT_FOUND); response.setStatusCode(HttpStatus.NOT_FOUND);
return; return;
} }
@ -345,16 +341,7 @@ public abstract class AbstractSockJsService implements SockJsService {
} }
// Server and session id's must not contain "." // Server and session id's must not contain "."
if (serverId.contains(".") || sessionId.contains(".")) { if (serverId.contains(".") || sessionId.contains(".")) {
<<<<<<< HEAD
logger.error("Server or session contain a \".\"");
return false;
}
if (!isWebSocketEnabled() && transport.equals("websocket")) {
logger.debug("Ignoring WebSocket request (transport disabled via SockJsService property)");
=======
logger.error("Either server or session contains a \".\" which is not allowed by SockJS protocol."); logger.error("Either server or session contains a \".\" which is not allowed by SockJS protocol.");
>>>>>>> STOMP and WebSocket messaging related logging updates
return false; return false;
} }
return true; return true;