From e012689f3f9aae4584e052fc1f60a7638b62dfc8 Mon Sep 17 00:00:00 2001 From: jimi-21 Date: Wed, 18 Nov 2026 16:21:55 +0800 Subject: [PATCH 1/2] Preserve mutable headers for ordered user destinations Keep the copied SimpMessageHeaderAccessor mutable when sending an immutable message so that OrderedMessageChannelDecorator can add its task header for every user session. Closes gh-37680 Signed-off-by: jimi-21 --- .../springframework/messaging/simp/SimpMessagingTemplate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java index cb19104dd512..01ec3275a0bc 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java @@ -163,6 +163,7 @@ protected void doSend(String destination, Message message) { else { // Try and keep the original accessor type simpAccessor = (SimpMessageHeaderAccessor) MessageHeaderAccessor.getMutableAccessor(message); + simpAccessor.setLeaveMutable(true); initHeaders(simpAccessor); } } From b60dc87d8329e50f52e6a8cb6e4e041792e578b8 Mon Sep 17 00:00:00 2001 From: jimi-21 Date: Wed, 18 Nov 2026 16:24:05 +0800 Subject: [PATCH 2/2] Add test for handling messages to multiple sessions Signed-off-by: jimi-21 --- .../UserDestinationMessageHandlerTests.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java index cb6f5b03cc36..f7378fd491b1 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java @@ -17,6 +17,8 @@ package org.springframework.messaging.simp.user; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -30,9 +32,13 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageType; +import org.springframework.messaging.simp.SimpMessagingTemplate; +import org.springframework.messaging.simp.broker.OrderedMessageChannelDecorator; import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler; import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.simp.stomp.StompHeaderAccessor; +import org.springframework.messaging.support.ExecutorSubscribableChannel; +import org.springframework.messaging.support.ImmutableMessageChannelInterceptor; import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; @@ -40,6 +46,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.ORIGINAL_DESTINATION; /** @@ -100,6 +107,31 @@ void handleMessage() { assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo"); } + @Test + void handleMessageWithPreserveReceiveOrderToMultipleSessions() { + TestSimpUser simpUser = new TestSimpUser("joe"); + simpUser.addSessions(new TestSimpSession("123"), new TestSimpSession("456")); + when(this.registry.getUser("joe")).thenReturn(simpUser); + ExecutorSubscribableChannel inboundChannel = new ExecutorSubscribableChannel(); + OrderedMessageChannelDecorator.configureInterceptor(inboundChannel, true); + ExecutorSubscribableChannel brokerChannel = new ExecutorSubscribableChannel(); + brokerChannel.addInterceptor(new ImmutableMessageChannelInterceptor()); + List destinations = new ArrayList<>(); + brokerChannel.subscribe(message -> { + String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders()); + if (destination != null && !destination.startsWith("/user/")) { + destinations.add(destination); + } + }); + brokerChannel.subscribe(new UserDestinationMessageHandler(inboundChannel, brokerChannel, + new DefaultUserDestinationResolver(this.registry))); + SimpMessagingTemplate messagingTemplate = new SimpMessagingTemplate(brokerChannel); + + messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data"); + + assertThat(destinations).containsExactlyInAnyOrder("/queue/foo-user123", "/queue/foo-user456"); + } + @Test @SuppressWarnings("rawtypes") void handleMessageWithoutSessionIds() {