From 0b8ca3aee0aed700819d09facf2ac31534a2cea1 Mon Sep 17 00:00:00 2001 From: Marco Cozzi Date: Thu, 12 Jun 2025 12:09:10 +0200 Subject: [PATCH] GH-3079: allow sending ACKs within the ShutdownTimeout period Signed-off-by: Marco Cozzi --- .../amqp/rabbit/listener/BlockingQueueConsumer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java index 0400062417..b49ae95419 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java @@ -888,7 +888,7 @@ public void rollbackOnExceptionIfNecessary(Throwable ex, long tag) { /** * Perform a commit or message acknowledgement, as appropriate. - * NOTE: This method was never been intended tobe public. + * NOTE: This method was never intended to be public. * @param localTx Whether the channel is locally transacted. * @param forceAck perform {@link Channel#basicAck(long, boolean)} independently of {@link #acknowledgeMode}. * @return true if at least one delivery tag exists. @@ -909,7 +909,7 @@ boolean commitIfNecessary(boolean localTx, boolean forceAck) { try { boolean ackRequired = forceAck || (!this.acknowledgeMode.isAutoAck() && !this.acknowledgeMode.isManual()); - if (ackRequired && (!this.transactional || (isLocallyTransacted && !cancelled()))) { + if (ackRequired && (!this.transactional || isLocallyTransacted)) { OptionalLong deliveryTag = this.deliveryTags.stream().mapToLong(l -> l).max(); deliveryTag.ifPresent((tag) -> { try {