From 15ab1842908bb930f4c4ab107eb23fa66f64a48e Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 27 Jun 2019 12:13:08 -0400
Subject: [PATCH] GH-1145: Backport NPE Fix

Resolves https://github.com/spring-projects/spring-kafka/issues/1145

**cherry-pick to 2.0.x, 1.3.x**
---
 .../kafka/listener/KafkaMessageListenerContainer.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
index 200e6f9f20..67b0c242f2 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
@@ -630,7 +630,10 @@ else if (KafkaMessageListenerContainer.this.getContainerProperties().isSyncCommi
 			};
 		}
 
-		private void seekPartitions(Collection<TopicPartition> partitions, boolean idle) {
+		private void seekPartitions(@Nullable Collection<TopicPartition> partitions, boolean idle) {
+			if (partitions == null) {
+				return;
+			}
 			Map<TopicPartition, Long> current = new HashMap<>();
 			for (TopicPartition topicPartition : partitions) {
 				current.put(topicPartition, ListenerConsumer.this.consumer.position(topicPartition));