GH-881: Null check in closeProducers()

garyrussell · artembilan · commit be0cb65a897d · 2018-11-19T14:13:10.000-05:00
Fixes #881 `getAssignedPartitions()` can return `null`. # Conflicts: # spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java * Add import for `@Nullable` # Conflicts: # spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
@@ -1236,7 +1236,8 @@ public void seekToEnd(String topic, int partition) {
 		}
 
 		private void closeProducers(Collection<TopicPartition> partitions) {
-			if (this.kafkaTxManager.getProducerFactory() instanceof DefaultKafkaProducerFactory) {
+			if (partitions != null &&
+					this.kafkaTxManager.getProducerFactory() instanceof DefaultKafkaProducerFactory) {
 				DefaultKafkaProducerFactory<?, ?> producerFactory =
 						(DefaultKafkaProducerFactory<?, ?>) this.kafkaTxManager.getProducerFactory();
 				for (TopicPartition tp : partitions) {

Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,8 @@ public void seekToEnd(String topic, int partition) {`
`1236`	`1236`	`}`
`1237`	`1237`
`1238`	`1238`	`private void closeProducers(Collection<TopicPartition> partitions) {`
`1239`		`- if (this.kafkaTxManager.getProducerFactory() instanceof DefaultKafkaProducerFactory) {`
	`1239`	`+ if (partitions != null &&`
	`1240`	`+ this.kafkaTxManager.getProducerFactory() instanceof DefaultKafkaProducerFactory) {`
`1240`	`1241`	`DefaultKafkaProducerFactory<?, ?> producerFactory =`
`1241`	`1242`	`(DefaultKafkaProducerFactory<?, ?>) this.kafkaTxManager.getProducerFactory();`
`1242`	`1243`	`for (TopicPartition tp : partitions) {`