Ensure concurrent WebSocketSession wrapper is used

Issue: SPR-13326
spring-projects · Aug 13, 2015 · 33f9ead · 33f9ead
1 parent 7575271
commit 33f9ead
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...t/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java b/...t/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
@@ -305,9 +305,12 @@ else if (this.protocolHandlers.size() == 1) {
 	 */
 	@Override
 	public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
+		WebSocketSessionHolder holder = this.sessions.get(session.getId());
+		if (holder != null) {
+			session = holder.getSession();
+		}
 		SubProtocolHandler protocolHandler = findProtocolHandler(session);
 		protocolHandler.handleMessageFromClient(session, message, this.clientInboundChannel);
-		WebSocketSessionHolder holder = this.sessions.get(session.getId());
 		if (holder != null) {
 			holder.setHasHandledMessages();
 		}