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

artembilan · artembilan · commit c6519b274fec · 2025-11-26T14:01:24.000-05:00
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()` **Auto-cherry-pick to `3.2.x`**
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
@@ -200,7 +200,10 @@ protected 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
`@@ -200,7 +200,10 @@ protected void handleException(org.springframework.amqp.core.Message amqpMessage`
`200`	`200`	`handleResult(invResult, amqpMessage, channel, message);`
`201`	`201`	`}`
`202`	`202`	`else {`
`203`		`- logger.trace("Error handler returned no result");`
	`203`	`+ logger.trace("Error handler returned no result; acknowledging the message.");`
	`204`	`+ if (isManualAck()) {`
	`205`	`+ basicAck(amqpMessage, channel);`
	`206`	`+ }`
`204`	`207`	`}`
`205`	`208`	`}`
`206`	`209`	`catch (Exception ex) {`