| commit | eb5f1be73c0806d7298315b4c247a45e2484463f | [log] [tgz] |
|---|---|---|
| author | Rémi KOWALSKI <rkowalski@linagora.com> | Tue Oct 15 16:17:26 2019 +0200 |
| committer | Raphael Ouazana <raphael.ouazana@linagora.com> | Fri Oct 18 08:40:10 2019 +0200 |
| tree | 87ea67eafeaafc104335e915c1103dfe9d7aefa6 | |
| parent | 139e70c0a7569369616c2bf403c7c112aeb89320 [diff] |
JAMES-2813 delete rabbitmq queue after each test on distributed task manager
diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java index 577be12..668b808 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQExtension.java
@@ -118,10 +118,10 @@ } @Override - public void afterEach(ExtensionContext context) { + public void afterEach(ExtensionContext context) throws Exception { simpleChannelPool.close(); connectionPool.close(); - + rabbitMQ.reset(); dockerRestartPolicy.afterEach(rabbitMQ); }
diff --git a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java index e736798..21a9880 100644 --- a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java +++ b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/RabbitMQWorkQueue.java
@@ -203,6 +203,7 @@ public void close() { Optional.ofNullable(receiverHandle).ifPresent(Disposable::dispose); Optional.ofNullable(receiver).ifPresent(RabbitMQExclusiveConsumer::close); + Optional.ofNullable(sender).ifPresent(Sender::close); Optional.ofNullable(sendCancelRequestsQueueHandle).ifPresent(Disposable::dispose); Optional.ofNullable(cancelRequestListenerHandle).ifPresent(Disposable::dispose); Optional.ofNullable(sender).ifPresent(Sender::close);