Fix regression in StompHeaderAccessor

rstoyanchev · rstoyanchev · commit 4fe94dffc044 · 2017-12-11T16:42:27.000-05:00
Issue: SPR-16265
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
@@ -194,7 +194,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);

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ public StompCommand updateStompCommandAsClientMessage() {`
`194`	`194`	`}`
`195`	`195`	`StompCommand command = getCommand();`
`196`	`196`	`if (command == null) {`
`197`		`- setHeader(COMMAND_HEADER, StompCommand.SEND);`
	`197`	`+ command = StompCommand.SEND;`
	`198`	`+ setHeader(COMMAND_HEADER, command);`
`198`	`199`	`}`
`199`	`200`	`else if (!command.equals(StompCommand.SEND)) {`
`200`	`201`	`throw new IllegalStateException("Unexpected STOMP command " + command);`