From d81cb16dfb8a299dba20c79f733f8c7f245aa7d4 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Thu, 13 Dec 2018 16:54:39 +0100
Subject: [PATCH] polishing

---
 .../stream/binding/MessageConverterConfigurer.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/MessageConverterConfigurer.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/MessageConverterConfigurer.java
index dd48f3030..6d75bfdaf 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/MessageConverterConfigurer.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/MessageConverterConfigurer.java
@@ -352,12 +352,10 @@ public class MessageConverterConfigurer implements MessageChannelAndSourceConfig
 				}
 			}
 			else {
-				if (!contentTypeHeaderSet) {
-					@SuppressWarnings("unchecked")
-					Map<String, Object> headersMap = (Map<String, Object>) ReflectionUtils.getField(MessageConverterConfigurer.this.headersField,
-							outboundMessage.getHeaders());
-					headersMap.remove(MessageHeaders.CONTENT_TYPE);
-				}
+				@SuppressWarnings("unchecked")
+				Map<String, Object> headersMap = (Map<String, Object>) ReflectionUtils.getField(MessageConverterConfigurer.this.headersField,
+						outboundMessage.getHeaders());
+				headersMap.remove(MessageHeaders.CONTENT_TYPE);
 			}
 			// ===== END 1.3 backward compatibility code part-2 ===
 			return outboundMessage;