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

GH-2874: Syslog - copy IpHeaders to message

Browse Source 
Resolves https://github.com/spring-projects/spring-integration/issues/2874

**cherry-pick to 5.1.x**
This commit is contained in:
Gary Russell
2019-04-01 11:20:34 -04:00
committed by Artem Bilan
parent d2853be1ca
commit cb538619bb
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java
View File

@@ -93,6 +93,7 @@ public class DefaultMessageConverter implements MessageConverter, BeanFactoryAwa
}
}
return getMessageBuilderFactory().withPayload(this.asMap ? map : message.getPayload())
.copyHeaders(message.getHeaders())
.copyHeaders(out)
.build();
}

3
spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java
View File

@@ -85,7 +85,8 @@ public class RFC5424MessageConverter extends DefaultMessageConverter {
}
AbstractIntegrationMessageBuilder<Object> builder = getMessageBuilderFactory().withPayload(
asMap() ? map : originalContent);
asMap() ? map : originalContent)
.copyHeaders(message.getHeaders());
if (!asMap() && isMap) {
builder.copyHeaders(map);
}