Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4257: Polishing

Browse Source 
Make `EnhancedErrorMessage` ctors consistent with the new 5.0 ErrorMessage

Fix ctor usage
This commit is contained in:
Gary Russell
2017-04-24 16:22:30 -04:00
committed by Artem Bilan
parent 089298e6be
commit b5c6158117
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-core/src/main/java/org/springframework/integration/message/EnhancedErrorMessage.java
View File

@@ -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<String, Object> headers) {
public EnhancedErrorMessage(Throwable payload, Map<String, Object> headers, Message<?> originalMessage) {
super(payload, headers);
this.originalMessage = originalMessage;
}

2
spring-integration-core/src/main/java/org/springframework/integration/support/DefaultErrorMessageStrategy.java
View File

@@ -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);
}