From 731aa3fe0cb714a852309d7b3101d844c0caad8b Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Thu, 4 Mar 2021 16:03:43 +0100
Subject: [PATCH] GH-661 Fix KafkaNull conversion

---
 .../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 bff5cdb2a..9733b2a01 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
@@ -842,7 +842,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 					}
 					else if (!FunctionTypeUtils.isMessage(type)) {
 						if (this.payloadIsSpecialType(((Message<?>) value).getPayload())) {
-							return ((Message<?>) value).getPayload();
+							return FunctionTypeUtils.isMessage(type) ? value : null;
 						}
 						if (!((Message<?>) convertedValue).getHeaders().containsKey("scf-sink-url")) {
 							convertedValue = ((Message<?>) convertedValue).getPayload();