From bbf101eef6b4692f2919ec0c2ed7249aa4c98564 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 25 Mar 2014 09:59:09 -0400 Subject: [PATCH] Fix issue in last commit --- .../web/socket/messaging/StompSubProtocolHandler.java | 4 ++-- .../web/socket/messaging/StompSubProtocolHandlerTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java index f68ec4f1d56..ad68b0f861a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java @@ -187,7 +187,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); - if (this.eventPublisher != null && StompCommand.CONNECT.equals(headers.getMessageType())) { + if (this.eventPublisher != null && StompCommand.CONNECT.equals(headers.getCommand())) { publishEvent(new SessionConnectEvent(this, message)); } @@ -265,7 +265,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE try { message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); - if (this.eventPublisher != null && StompCommand.CONNECTED.equals(headers.getMessageType())) { + if (this.eventPublisher != null && StompCommand.CONNECTED.equals(headers.getCommand())) { publishEvent(new SessionConnectedEvent(this, (Message) message)); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java index 5ba221749c7..5aaf1127abf 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java @@ -183,7 +183,7 @@ public class StompSubProtocolHandlerTests { this.protocolHandler.afterSessionEnded(this.session, CloseStatus.BAD_DATA, this.channel); - assertEquals(3, publisher.events.size()); + assertEquals("Unexpected events " + publisher.events, 3, publisher.events.size()); assertEquals(SessionConnectEvent.class, publisher.events.get(0).getClass()); assertEquals(SessionConnectedEvent.class, publisher.events.get(1).getClass()); assertEquals(SessionDisconnectEvent.class, publisher.events.get(2).getClass());