SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addressing PR review comments

Browse Source 
Resolves #258
This commit is contained in:
Soby Chacko
2017-11-14 16:42:36 -05:00
committed by Oleg Zhurakousky
parent 2f6d5df7bc
commit b0c4f0cfcd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/KafkaMessageChannelBinder.java
View File

@@ -439,9 +439,10 @@ public class KafkaMessageChannelBinder extends
final ConsumerRecord<?, ?> record = message.getHeaders()
.get(KafkaHeaders.RAW_DATA, ConsumerRecord.class);
if (this.transactionManager == null && extendedConsumerProperties.isUseNativeDecoding()) {
if (extendedConsumerProperties.isUseNativeDecoding()) {
if (record != null) {
Map<String, String> configuration = dlqProducerProperties.getConfiguration();
Map<String, String> configuration = this.transactionManager == null ? dlqProducerProperties.getConfiguration()
: this.configurationProperties.getTransaction().getProducer().getConfiguration();
if (record.key() != null && !record.key().getClass().isInstance(byte[].class)) {
ensureDlqMessageCanBeProperlySerialized(
configuration,