From c01b25f2fa4cc902ea01c8bb9867aa870dd6fcc6 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 22 Feb 2021 16:10:05 +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 6ecea9b22..ecf25b11a 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
@@ -855,7 +855,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 			else if (input instanceof Message) {
 				if (((Message) input).getPayload().getClass().getName().equals("org.springframework.kafka.support.KafkaNull")
 						&& !this.isInputTypeMessage()) { //TODO rework
-					return null;
+					return ((Message) input).getPayload();
 				}
 
 				if (functionInvocationHelper != null) {