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

StompSubProtocolHandler does not insist on SimpMessageHeaderAccessor

Browse Source 
Issue: SPR-14791
(cherry picked from commit 66722af)
This commit is contained in:
Juergen Hoeller
2016-10-12 17:08:05 +02:00
parent 7a8bf8e9a5
commit f5cd5387da
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
View File

@@ -34,7 +34,6 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.simp.SimpAttributes; import org.springframework.messaging.simp.SimpAttributes;
import org.springframework.messaging.simp.SimpAttributesContextHolder; import org.springframework.messaging.simp.SimpAttributesContextHolder;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
@@ -463,18 +462,13 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
} }
} }
private StompHeaderAccessor getStompHeaderAccessor(Message<?> message) { private StompHeaderAccessor getStompHeaderAccessor(Message<?> message) {
MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class); MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class);
if (accessor == null) {
// Shouldn't happen (only broker broadcasts directly to clients)
throw new IllegalStateException("No header accessor in " + message);
}
StompHeaderAccessor stompAccessor;
if (accessor instanceof StompHeaderAccessor) { if (accessor instanceof StompHeaderAccessor) {
stompAccessor = (StompHeaderAccessor) accessor; return (StompHeaderAccessor) accessor;
} }
else if (accessor instanceof SimpMessageHeaderAccessor) { else {
stompAccessor = StompHeaderAccessor.wrap(message); StompHeaderAccessor stompAccessor = StompHeaderAccessor.wrap(message);
SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(message.getHeaders()); SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(message.getHeaders());
if (SimpMessageType.CONNECT_ACK.equals(messageType)) { if (SimpMessageType.CONNECT_ACK.equals(messageType)) {
stompAccessor = convertConnectAcktoStompConnected(stompAccessor); stompAccessor = convertConnectAcktoStompConnected(stompAccessor);
@@ -496,13 +490,8 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
else if (stompAccessor.getCommand() == null || StompCommand.SEND.equals(stompAccessor.getCommand())) { else if (stompAccessor.getCommand() == null || StompCommand.SEND.equals(stompAccessor.getCommand())) {
stompAccessor.updateStompCommandAsServerMessage(); stompAccessor.updateStompCommandAsServerMessage();
} }
return stompAccessor;
} }
else {
// Shouldn't happen (only broker broadcasts directly to clients)
throw new IllegalStateException(
"Unexpected header accessor type: " + accessor.getClass() + " in " + message);
}
return stompAccessor;
} }
/** /**