From f2bdddd26e8d49d06a3b25c36005aac3eecc54c3 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 16 Apr 2025 21:12:27 +0200
Subject: [PATCH] GH-1266 Additional cleanup  of SimpleFunctionRegistry

---
 .../cloud/function/context/catalog/SimpleFunctionRegistry.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index 39cea3a0e..cbde568cb 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -808,7 +808,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
 				if (functionInvocationHelper != null && CloudEventMessageUtils.isCloudEvent(((Message) input))) {
 					result = functionInvocationHelper.postProcessResult(result, (Message) input);
 				}
-				if (!FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
+				if (!(result instanceof Message) && !FunctionTypeUtils.isCollectionOfMessage(this.outputType)) {
 					result = MessageBuilder.withPayload(result).copyHeaders(this.sanitizeHeaders(((Message) input).getHeaders())).build();
 				}
 			}