diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-19 12:18:13 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-19 12:18:13 +0000 |
| commit | f78ed1078d86fc879b00c050fb1b10eb381cfe21 (patch) | |
| tree | 22fd1581a0d49fec78b9df1ca1251bb98ae612a8 /src | |
| parent | 0922d853ec6c8b5e8035c0f76517399371e5fc8a (diff) | |
| download | rabbitmq-server-git-f78ed1078d86fc879b00c050fb1b10eb381cfe21.tar.gz | |
optimise "no messages dead-lettered during expiry" case
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index f87f57777e..1c324bbf62 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -728,8 +728,10 @@ drop_expired_messages(State = #q{dlx = DLX, {Next, BQS2}; _ -> {Next, Msgs, BQS2} = BQ:dropwhile(ExpirePred, true, BQS), - DLXFun = dead_letter_fun(expired), - DLXFun(Msgs), + case Msgs of + [] -> ok; + _ -> (dead_letter_fun(expired))(Msgs) + end, {Next, BQS2} end, ensure_ttl_timer(case Props of |