From a207d0c421004eea2c81f28de781f0c31dbe5338 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 22 Feb 2021 16:00:54 +0100
Subject: [PATCH] SCST-GH-2115 Ensure that in a case of KafkaNull we just
 return a payload

---
 .../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 bb5086916..bff5cdb2a 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 null;
+							return ((Message<?>) value).getPayload();
 						}
 						if (!((Message<?>) convertedValue).getHeaders().containsKey("scf-sink-url")) {
 							convertedValue = ((Message<?>) convertedValue).getPayload();