From cef85f8cc7334a5ed7a83872b3eb362c4fd2c8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= <remi.alvergnat@gfi.fr>
Date: Tue, 5 Dec 2017 15:10:56 +0100
Subject: [PATCH] Fix Stomp Broker Relay ignoring destination prefixes in some
 cases

Issue: SPR-16265
---
 .../messaging/simp/stomp/StompHeaderAccessor.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
index c3dc19270498..438b7fba775c 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
@@ -197,7 +197,8 @@ public StompCommand updateStompCommandAsClientMessage() {
 		}
 		StompCommand command = getCommand();
 		if (command == null) {
-			setHeader(COMMAND_HEADER, StompCommand.SEND);
+			command = StompCommand.SEND
+			setHeader(COMMAND_HEADER, command);
 		}
 		else if (!command.equals(StompCommand.SEND)) {
 			throw new IllegalStateException("Unexpected STOMP command " + command);