diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
index 6c691af57f..3dbccf3a3e 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
package org.springframework.web.socket.sockjs.transport.session;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
+import java.util.stream.Collectors;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +59,7 @@ public abstract class AbstractSockJsSession implements SockJsSession {
/**
* Log category to use on network IO exceptions after a client has gone away.
- * Servlet containers dn't expose a a client disconnected callback, see
+ *
Servlet containers don't expose a client disconnected callback; see
* eclipse-ee4j/servlet-api#44.
* Therefore network IO failures may occur simply because a client has gone away,
* and that can fill the logs with unnecessary stack traces.
@@ -121,7 +122,7 @@ public abstract class AbstractSockJsSession implements SockJsSession {
* @param id the session ID
* @param config the SockJS service configuration options
* @param handler the recipient of SockJS messages
- * @param attributes attributes from the HTTP handshake to associate with the WebSocket
+ * @param attributes the attributes from the HTTP handshake to associate with the WebSocket
* session; the provided attributes are copied, the original map is not used.
*/
public AbstractSockJsSession(String id, SockJsServiceConfig config, WebSocketHandler handler,
@@ -162,6 +163,7 @@ public abstract class AbstractSockJsSession implements SockJsSession {
// Message sending
+ @Override
public final void sendMessage(WebSocketMessage message) throws IOException {
Assert.state(!isClosed(), "Cannot send a message when session is closed");
Assert.isInstanceOf(TextMessage.class, message, "SockJS supports text messages only");
@@ -376,20 +378,45 @@ public abstract class AbstractSockJsSession implements SockJsSession {
}
public void delegateMessages(String... messages) throws SockJsMessageDeliveryException {
- List undelivered = new ArrayList<>(Arrays.asList(messages));
- for (String message : messages) {
+ for (int i = 0; i < messages.length; i++) {
try {
if (isClosed()) {
- throw new SockJsMessageDeliveryException(this.id, undelivered, "Session closed");
+ logUndeliveredMessages(i, messages);
+ return;
}
- else {
- this.handler.handleMessage(this, new TextMessage(message));
- undelivered.remove(0);
+ this.handler.handleMessage(this, new TextMessage(messages[i]));
+ }
+ catch (Exception ex) {
+ if (isClosed()) {
+ if (logger.isTraceEnabled()) {
+ logger.trace("Failed to handle message '" + messages[i] + "'", ex);
+ }
+ logUndeliveredMessages(i, messages);
+ return;
}
+ throw new SockJsMessageDeliveryException(this.id, getUndelivered(messages, i), ex);
}
- catch (Throwable ex) {
- throw new SockJsMessageDeliveryException(this.id, undelivered, ex);
- }
+ }
+ }
+
+ private void logUndeliveredMessages(int index, String[] messages) {
+ List undelivered = getUndelivered(messages, index);
+ if (logger.isTraceEnabled() && !undelivered.isEmpty()) {
+ logger.trace("Dropped inbound message(s) due to closed session: " + undelivered);
+ }
+ }
+
+ private static List getUndelivered(String[] messages, int i) {
+ switch (messages.length - i) {
+ case 0:
+ return Collections.emptyList();
+ case 1:
+ return (messages[i].trim().isEmpty() ?
+ Collections.emptyList() : Collections.singletonList(messages[i]));
+ default:
+ return Arrays.stream(Arrays.copyOfRange(messages, i, messages.length))
+ .filter(message -> !message.trim().isEmpty())
+ .collect(Collectors.toList());
}
}
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
index f670b8b156..51218de047 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.handler.ExceptionWebSocketHandlerDecorator;
-import org.springframework.web.socket.sockjs.SockJsMessageDeliveryException;
import org.springframework.web.socket.sockjs.SockJsTransportFailureException;
import org.springframework.web.socket.sockjs.frame.SockJsFrame;
@@ -118,18 +117,13 @@ public class SockJsSessionTests extends AbstractSockJsSessionTests