From b5c61581177e0582c089d0b6ca64692e17b520d0 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 24 Apr 2017 16:22:30 -0400 Subject: [PATCH] INT-4257: Polishing Make `EnhancedErrorMessage` ctors consistent with the new 5.0 ErrorMessage Fix ctor usage --- .../integration/message/EnhancedErrorMessage.java | 6 +++--- .../integration/support/DefaultErrorMessageStrategy.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/EnhancedErrorMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/EnhancedErrorMessage.java index cd3d163d76..be8e82541f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/EnhancedErrorMessage.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/EnhancedErrorMessage.java @@ -42,17 +42,17 @@ public class EnhancedErrorMessage extends ErrorMessage { private final Message originalMessage; - public EnhancedErrorMessage(Message originalMessage, Throwable payload) { + public EnhancedErrorMessage(Throwable payload, Message originalMessage) { super(payload); this.originalMessage = originalMessage; } - public EnhancedErrorMessage(Message originalMessage, Throwable payload, MessageHeaders headers) { + public EnhancedErrorMessage(Throwable payload, MessageHeaders headers, Message originalMessage) { super(payload, headers); this.originalMessage = originalMessage; } - public EnhancedErrorMessage(Message originalMessage, Throwable payload, Map headers) { + public EnhancedErrorMessage(Throwable payload, Map headers, Message originalMessage) { super(payload, headers); this.originalMessage = originalMessage; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultErrorMessageStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultErrorMessageStrategy.java index da5853e64d..42b02a7364 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultErrorMessageStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultErrorMessageStrategy.java @@ -40,7 +40,7 @@ public class DefaultErrorMessageStrategy implements ErrorMessageStrategy { public ErrorMessage buildErrorMessage(Throwable throwable, AttributeAccessor attributes) { Object inputMessage = attributes.getAttribute(ErrorMessageUtils.INPUT_MESSAGE_CONTEXT_KEY); return inputMessage instanceof Message - ? new org.springframework.integration.message.EnhancedErrorMessage((Message) inputMessage, throwable) + ? new org.springframework.integration.message.EnhancedErrorMessage(throwable, (Message) inputMessage) : new ErrorMessage(throwable); }