diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-05-14 01:11:40 +0800 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2016-05-14 01:11:40 +0800 |
| commit | 5ea6f6ffdf780b014b86d7f9d0b1012360f7cc97 (patch) | |
| tree | 84a03161dbc9e267d41b0f98c525a5345d35efe8 | |
| parent | 6e0ce13ba7cda10bcd46924a0eafaf5c8c3ebd8a (diff) | |
| parent | 8e9ec88fb5ad318cf636770e95bda7c70400a5fb (diff) | |
| download | rabbitmq-server-git-5ea6f6ffdf780b014b86d7f9d0b1012360f7cc97.tar.gz | |
Merge pull request #797 from rabbitmq/rabbitmq-server-795
Limit priority to maximum during synchronisation
| -rw-r--r-- | src/rabbit_priority_queue.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl index b58a8c535e..6141796f7b 100644 --- a/src/rabbit_priority_queue.erl +++ b/src/rabbit_priority_queue.erl @@ -563,8 +563,9 @@ findfold3(Fun, Acc, NotFound, [{P, BQSN} | Rest], BQSAcc) -> findfold3(_Fun, Acc, NotFound, [], BQSAcc) -> {NotFound, Acc, lists:reverse(BQSAcc)}. -bq_fetch(P, []) -> exit({not_found, P}); +bq_fetch(P, []) -> exit({not_found, P}); bq_fetch(P, [{P, BQSN} | _]) -> BQSN; +bq_fetch(P, [{P1, BQSN} | _]) when P > P1 -> BQSN; bq_fetch(P, [{_, _BQSN} | T]) -> bq_fetch(P, T). bq_store(P, BQS, BQSs) -> |