Skip to content

GH-3079: allow sending ACKs within the ShutdownTimeout period #3089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged

GH-3079: allow sending ACKs within the ShutdownTimeout period #3089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 {
Expand Down