From 28ffac0fe34cbce24c6be67a3a0cb6b7d7a329ea Mon Sep 17 00:00:00 2001
From: rahulmlokurte <rahul.m.lokurte@gmail.com>
Date: Mon, 4 Apr 2022 13:50:54 +0530
Subject: [PATCH] Fix #844 issue custom object type conversion is failing, when
 it has headers as a variable name

Resolves #850
---
 .../cloud/function/adapter/aws/AWSLambdaUtils.java               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
index c0cb9100e..18e9c7d4d 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
@@ -121,6 +121,7 @@ final class AWSLambdaUtils {
 				}
 				Object providedHeaders = ((Map) request).remove("headers");
 				if (providedHeaders != null && providedHeaders instanceof Map) {
+					messageBuilder = MessageBuilder.withPayload(request);
 					messageBuilder.removeHeader("headers");
 					messageBuilder.copyHeaders((Map<String, Object>) providedHeaders);
 				}