Fiux Checkstyle violation in the BaseMessageBuilder

artembilan · artembilan · commit bd067da100b6 · 2024-10-29T16:04:16.000-04:00
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
@@ -310,10 +310,10 @@ public Message<T> build() {
 
 			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) {

Original file line number	Diff line number	Diff line change
`@@ -310,10 +310,10 @@ public Message<T> build() {`
`310`	`310`
`311`	`311`	`return this.originalMessage;`
`312`	`312`	`}`
`313`		`- if (payload instanceof Throwable throwable) {`
`314`		`- return (Message<T>) new ErrorMessage(throwable, getHeaders());`
	`313`	`+ if (this.payload instanceof Throwable throwable) {`
	`314`	`+ return (Message<T>) new ErrorMessage(throwable, this.headerAccessor.toMap());`
`315`	`315`	`}`
`316`		`- return new GenericMessage<>(payload, getHeaders());`
	`316`	`+ return new GenericMessage<>(this.payload, this.headerAccessor.toMap());`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`private boolean containsReadOnly(MessageHeaders headers) {`