Skip to content

Commit d2ec876

Browse files
committed
Consistently close connection after ERROR frame
Closes gh-23039
1 parent 4f05da7 commit d2ec876

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,10 @@ private void handleError(WebSocketSession session, Throwable ex, @Nullable Messa
329329
sendErrorMessage(session, ex);
330330
return;
331331
}
332-
333332
Message<byte[]> message = getErrorHandler().handleClientMessageProcessingError(clientMessage, ex);
334333
if (message == null) {
335334
return;
336335
}
337-
338336
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
339337
Assert.state(accessor != null, "No StompHeaderAccessor");
340338
sendToClient(session, accessor, message.getPayload());
@@ -357,6 +355,14 @@ private void sendErrorMessage(WebSocketSession session, Throwable error) {
357355
// Could be part of normal workflow (e.g. browser tab closed)
358356
logger.debug("Failed to send STOMP ERROR to client", ex);
359357
}
358+
finally {
359+
try {
360+
session.close(CloseStatus.PROTOCOL_ERROR);
361+
}
362+
catch (IOException ex) {
363+
// Ignore
364+
}
365+
}
360366
}
361367

362368
private boolean detectImmutableMessageInterceptor(MessageChannel channel) {

0 commit comments

Comments
 (0)