From 86f2ebec1b1f5438ba4d9908c71c710ef2f14219 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 30 Sep 2020 22:03:46 +0100
Subject: [PATCH] Fix recursion issue caused by previous commit

See gh-25821
---
 .../messaging/support/NativeMessageHeaderAccessor.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
index 251bd88931..5fbb9ead26 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
@@ -113,7 +113,7 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor {
 	public void setHeader(String name, @Nullable Object value) {
 		if (name.equalsIgnoreCase(NATIVE_HEADERS)) {
 			// Force removal since setHeader checks for equality
-			removeHeader(NATIVE_HEADERS);
+			super.setHeader(NATIVE_HEADERS, null);
 		}
 		super.setHeader(name, value);
 	}