Skip to content

Commit bbf101e

Browse files
committed
Fix issue in last commit
1 parent a247d5f commit bbf101e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void handleMessageFromClient(WebSocketSession session,
187187

188188
message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();
189189

190-
if (this.eventPublisher != null && StompCommand.CONNECT.equals(headers.getMessageType())) {
190+
if (this.eventPublisher != null && StompCommand.CONNECT.equals(headers.getCommand())) {
191191
publishEvent(new SessionConnectEvent(this, message));
192192
}
193193

@@ -265,7 +265,7 @@ else if (SimpMessageType.MESSAGE.equals(headers.getMessageType())) {
265265
try {
266266
message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();
267267

268-
if (this.eventPublisher != null && StompCommand.CONNECTED.equals(headers.getMessageType())) {
268+
if (this.eventPublisher != null && StompCommand.CONNECTED.equals(headers.getCommand())) {
269269
publishEvent(new SessionConnectedEvent(this, (Message<byte[]>) message));
270270
}
271271

spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public void eventPublication() {
183183

184184
this.protocolHandler.afterSessionEnded(this.session, CloseStatus.BAD_DATA, this.channel);
185185

186-
assertEquals(3, publisher.events.size());
186+
assertEquals("Unexpected events " + publisher.events, 3, publisher.events.size());
187187
assertEquals(SessionConnectEvent.class, publisher.events.get(0).getClass());
188188
assertEquals(SessionConnectedEvent.class, publisher.events.get(1).getClass());
189189
assertEquals(SessionDisconnectEvent.class, publisher.events.get(2).getClass());

0 commit comments

Comments
 (0)