GH-3247: Fix MANUAL ack for null from error handler

artembilan · spring-builds · commit 4cf056c77e57 · 2025-11-26T19:01:38.000Z
Fixes: #3247 When `MANUAL` ack mode and `RabbitListenerErrorHandler` returns `null`, the message is not acknowledged. * Fix `MessagingMessageListenerAdapter.handleException()` to call `basicAck(amqpMessage, channel);` when `isManualAck()` (cherry picked from commit c6519b2)
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java
@@ -191,7 +191,10 @@ private void handleException(org.springframework.amqp.core.Message amqpMessage,
 					handleResult(invResult, amqpMessage, channel, message);
 				}
 				else {
-					logger.trace("Error handler returned no result");
+					logger.trace("Error handler returned no result; acknowledging the message.");
+					if (isManualAck()) {
+						basicAck(amqpMessage, channel);
+					}
 				}
 			}
 			catch (Exception ex) {

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,10 @@ private void handleException(org.springframework.amqp.core.Message amqpMessage,`
`191`	`191`	`handleResult(invResult, amqpMessage, channel, message);`
`192`	`192`	`}`
`193`	`193`	`else {`
`194`		`- logger.trace("Error handler returned no result");`
	`194`	`+ logger.trace("Error handler returned no result; acknowledging the message.");`
	`195`	`+ if (isManualAck()) {`
	`196`	`+ basicAck(amqpMessage, channel);`
	`197`	`+ }`
`195`	`198`	`}`
`196`	`199`	`}`
`197`	`200`	`catch (Exception ex) {`