From 23ce9e3d6e6fd72a1f5c699f5a0a28b0224a72fd Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Thu, 5 Nov 2020 12:34:59 -0500 Subject: [PATCH] Fix NPE in Kafka Streams binder Resolves https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/981 --- .../streams/KafkaStreamsBindingInformationCatalogue.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java index 540d63b19..6323d265d 100644 --- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java +++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java @@ -105,7 +105,9 @@ class KafkaStreamsBindingInformationCatalogue { */ void registerBindingProperties(KStream bindingTarget, BindingProperties bindingProperties) { - this.bindingProperties.put(bindingTarget, bindingProperties); + if (bindingProperties != null) { + this.bindingProperties.put(bindingTarget, bindingProperties); + } } /** @@ -115,7 +117,9 @@ class KafkaStreamsBindingInformationCatalogue { */ void registerConsumerProperties(KStream bindingTarget, KafkaStreamsConsumerProperties kafkaStreamsConsumerProperties) { - this.consumerProperties.put(bindingTarget, kafkaStreamsConsumerProperties); + if (kafkaStreamsConsumerProperties != null) { + this.consumerProperties.put(bindingTarget, kafkaStreamsConsumerProperties); + } } /**