From da916303203901cee9e06fbd9637fb0ca64e33c6 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 17 Jul 2024 16:09:53 +0200
Subject: [PATCH] GH-STREAM-2971 Properly handle Kafka tombstone payload
 conversion

---
 .../cloud/function/context/config/JsonMessageConverter.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
index 414e39ecc..99721c184 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
@@ -128,6 +128,9 @@ public class JsonMessageConverter extends AbstractMessageConverter {
 	@Override
 	protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
 			@Nullable Object conversionHint) {
+		if (payload.getClass().getName().equals("org.springframework.kafka.support.KafkaNull")) {
+			return payload;
+		}
 		return jsonMapper.toJson(payload);
 	}