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

Publish events only after successful channel send

Browse Source 
The StompSubProtcolHandler now checks the outcome of the send to the
inbound client channel. If the message was prevented from being sent,
e.g. as part of authorization, events are not published

Issue: SPR-13339
This commit is contained in:
Rossen Stoyanchev
2015-08-21 10:46:54 -04:00
parent 473dd5e9e8
commit 27899abcb6
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,9 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
try {
SimpAttributesContextHolder.setAttributesFromMessage(message);
if (this.eventPublisher != null) {
boolean sent = outputChannel.send(message);
if (sent && this.eventPublisher != null) {
if (StompCommand.CONNECT.equals(headerAccessor.getCommand())) {
publishEvent(new SessionConnectEvent(this, message, user));
}
@@ -288,7 +290,6 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
publishEvent(new SessionUnsubscribeEvent(this, message, user));
}
}
outputChannel.send(message);
}
finally {
SimpAttributesContextHolder.resetAttributes();