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 fcd4ec16..b28ce83a 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 @@ -603,9 +603,6 @@ public class KafkaMessageListenerContainer extends AbstractMessageListener if (!this.isAnyManualAck && !this.autoCommit) { this.acks.add(record); } - if (this.isRecordAck) { - this.consumer.wakeup(); - } } catch (Exception e) { if (this.containerProperties.isAckOnError() && !this.autoCommit) { @@ -619,9 +616,6 @@ public class KafkaMessageListenerContainer extends AbstractMessageListener } } } - if (this.isManualAck || this.isBatchAck) { - this.consumer.wakeup(); - } } private void processCommits() { @@ -792,9 +786,6 @@ public class KafkaMessageListenerContainer extends AbstractMessageListener ListenerConsumer.this.logger.debug("Interrupt ignored"); } } - if (!ListenerConsumer.this.isManualImmediateAck && this.active) { - ListenerConsumer.this.consumer.wakeup(); - } } } finally { diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java index 67d47836..c095d687 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java @@ -525,7 +525,7 @@ public class KafkaMessageListenerContainerTests { }); containerProps.setSyncCommits(true); containerProps.setAckMode(AckMode.BATCH); - containerProps.setPollTimeout(10000); + containerProps.setPollTimeout(100); containerProps.setAckOnError(false); KafkaMessageListenerContainer container = new KafkaMessageListenerContainer<>(cf,