From bd067da100b6c954d48ef3cd7427d5790c798afe Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Tue, 29 Oct 2024 16:04:16 -0400
Subject: [PATCH] Fiux Checkstyle violation in the `BaseMessageBuilder`

---
 .../integration/support/BaseMessageBuilder.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/BaseMessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/BaseMessageBuilder.java
index a63408985f..488828c5d4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/BaseMessageBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/BaseMessageBuilder.java
@@ -310,10 +310,10 @@ public abstract class BaseMessageBuilder<T, B extends BaseMessageBuilder<T, B>>
 
 			return this.originalMessage;
 		}
-		if (payload instanceof Throwable throwable) {
-			return (Message<T>) new ErrorMessage(throwable, getHeaders());
+		if (this.payload instanceof Throwable throwable) {
+			return (Message<T>) new ErrorMessage(throwable, this.headerAccessor.toMap());
 		}
-		return new GenericMessage<>(payload, getHeaders());
+		return new GenericMessage<>(this.payload, this.headerAccessor.toMap());
 	}
 
 	private boolean containsReadOnly(MessageHeaders headers) {