Repository: james-project Updated Branches: refs/heads/master 8c99d0d9e -> b7d44a108
JAMES-2550 Avoid NPE upon MQ dequeue Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b7d44a10 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b7d44a10 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b7d44a10 Branch: refs/heads/master Commit: b7d44a1089e6388d32c1fb77376887bf2f8faf63 Parents: 8c99d0d Author: Benoit Tellier <btell...@linagora.com> Authored: Fri Dec 7 12:08:00 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Dec 7 12:08:00 2018 +0700 ---------------------------------------------------------------------- .../queue/rabbitmq/view/cassandra/CassandraMailQueueView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b7d44a10/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java index a0ca3cd..211917a 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/CassandraMailQueueView.java @@ -105,7 +105,8 @@ public class CassandraMailQueueView implements MailQueueView { public long delete(DeleteCondition deleteCondition) { if (deleteCondition instanceof DeleteCondition.WithName) { DeleteCondition.WithName nameDeleteCondition = (DeleteCondition.WithName) deleteCondition; - return delete(MailKey.of(nameDeleteCondition.getName())).map(any -> 1L).block(); + delete(MailKey.of(nameDeleteCondition.getName())).block(); + return 1L; } return browseThenDelete(deleteCondition); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
