root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SubProtocolWebSocketHandler closes sessions outside of lifecycle monitor 

Issue: SPR-16488
This commit is contained in:
Juergen Hoeller 2018-02-13 00:04:55 +01:00
parent a5a069c5b1
commit 3c631f8ea0
1 changed files with 12 additions and 8 deletions
Show Stats 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

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