From 5d0ffe7b80ae9f5f29015e9a4b8c33d2530e93c3 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Fri, 19 Mar 2021 15:08:04 +0100
Subject: [PATCH] GH-2113 Add safety check and create Message if necessary

. . . when sending data using template and the data is not a Message

Resolves #2113
---
 .../cloud/stream/function/FunctionConfiguration.java           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
index 7fc0420ef..cbec4d996 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
@@ -586,6 +586,9 @@ public class FunctionConfiguration {
 						outputChannel.send(((Message<?>) result));
 					}
 					else if (StringUtils.hasText(outputChannelName)) {
+						if (!(result instanceof Message)) {
+							result = MessageBuilder.withPayload(result).copyHeadersIfAbsent(requestMessage.getHeaders()).build();
+						}
 						template.send(outputChannelName, (Message<?>) result);
 					}
 				}