This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.7.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7674d94aa9a581bc0df4725070797cc296e28326 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jun 30 21:50:53 2023 +0700 JAMES-3924 Improve dequeuer Lifecycle management --- .../src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java index 671400a06d..214537df36 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/Dequeuer.java @@ -25,6 +25,7 @@ import java.util.function.Consumer; import org.apache.james.backends.rabbitmq.ReceiverProvider; import org.apache.james.blob.api.ObjectNotFoundException; +import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.metrics.api.Metric; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.queue.api.MailQueue; @@ -140,9 +141,11 @@ class Dequeuer { if (success) { dequeueMetric.increment(); response.ack(); + LifecycleUtil.dispose(mailWithEnqueueId.getMail()); Mono.from(mailQueueView.delete(DeleteCondition.withEnqueueId(mailWithEnqueueId.getEnqueueId(), mailWithEnqueueId.getBlobIds()))).block(); } else { response.nack(REQUEUE); + LifecycleUtil.dispose(mailWithEnqueueId.getMail()); } }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
