Browse Source

Fix issue in last commit

pull/492/merge
Rossen Stoyanchev 12 years ago
parent
commit
bbf101eef6
  1. 4
      spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
  2. 2
      spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java

4
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(); 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)); publishEvent(new SessionConnectEvent(this, message));
} }
@ -265,7 +265,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
try { try {
message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); 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<byte[]>) message)); publishEvent(new SessionConnectedEvent(this, (Message<byte[]>) message));
} }

2
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); 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(SessionConnectEvent.class, publisher.events.get(0).getClass());
assertEquals(SessionConnectedEvent.class, publisher.events.get(1).getClass()); assertEquals(SessionConnectedEvent.class, publisher.events.get(1).getClass());
assertEquals(SessionDisconnectEvent.class, publisher.events.get(2).getClass()); assertEquals(SessionDisconnectEvent.class, publisher.events.get(2).getClass());

Loading…
Cancel
Save