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

SubProtocolWebSocketHandler closes sessions outside of lifecycle monitor

Browse Source 
Issue: SPR-16488

(cherry picked from commit 3c631f8)
This commit is contained in:
Juergen Hoeller
2018-02-13 00:04:55 +01:00
parent 2033f50f22
commit 4be416e2ca
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
View File

@@ -242,6 +242,7 @@ public class SubProtocolWebSocketHandler
@Override
public final void start() {
Assert.isTrue(this.defaultProtocolHandler != null || !this.protocolHandlers.isEmpty(), "No handlers");
synchronized (this.lifecycleMonitor) {
this.clientOutboundChannel.subscribe(this);
this.running = true;
@@ -253,14 +254,16 @@ public class SubProtocolWebSocketHandler
synchronized (this.lifecycleMonitor) {
this.running = false;
this.clientOutboundChannel.unsubscribe(this);
for (WebSocketSessionHolder holder : this.sessions.values()) {
try {
holder.getSession().close(CloseStatus.GOING_AWAY);
}
catch (Throwable ex) {
if (logger.isWarnEnabled()) {
logger.warn("Failed to close '" + holder.getSession() + "': " + ex);
}
}
// Proactively notify all active WebSocket sessions
for (WebSocketSessionHolder holder : this.sessions.values()) {
try {
holder.getSession().close(CloseStatus.GOING_AWAY);
}
catch (Throwable ex) {
if (logger.isWarnEnabled()) {
logger.warn("Failed to close '" + holder.getSession() + "': " + ex);
}
}
}
@@ -288,6 +291,7 @@ public class SubProtocolWebSocketHandler
if (!session.isOpen()) {
return;
}
this.stats.incrementSessionCount(session);
session = decorateSession(session);
this.sessions.put(session.getId(), new WebSocketSessionHolder(session));