diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-31 12:32:06 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-31 12:32:06 +0000 |
| commit | e3b5b334349af6630bb1b764af090378cdaf73d3 (patch) | |
| tree | f07ea7a74cb835a975d0edd27ea2167addee0a5b /src/rabbit_queue_index.erl | |
| parent | 7f6543ca82df40f3710262aed52a3076898310dc (diff) | |
| parent | 00881c0e78aa14be4e3c353dd08f82f7ae3812a1 (diff) | |
| download | rabbitmq-server-e3b5b334349af6630bb1b764af090378cdaf73d3.tar.gz | |
merge bug25428 into bug25429
Diffstat (limited to 'src/rabbit_queue_index.erl')
| -rw-r--r-- | src/rabbit_queue_index.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index a055742e..6495115b 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -621,12 +621,12 @@ add_to_journal(RelSeq, Action, JEntries) -> del -> {no_pub, del, no_ack}; ack -> {no_pub, no_del, ack} end, JEntries); - ({?PUB, del, no_ack}) when Action == ack -> - array:reset(RelSeq, JEntries); - ({Pub, no_del, no_ack}) when Action == del -> - array:set(RelSeq, {Pub, del, no_ack}, JEntries); - ({Pub, Del, no_ack}) when Action == ack -> - array:set(RelSeq, {Pub, Del, ack}, JEntries) + ({Pub, no_del, no_ack}) when Action == del -> + array:set(RelSeq, {Pub, del, no_ack}, JEntries); + ({no_pub, del, no_ack}) when Action == ack -> + array:set(RelSeq, {no_pub, del, ack}, JEntries); + ({?PUB, del, no_ack}) when Action == ack -> + array:reset(RelSeq, JEntries) end. maybe_flush_journal(State = #qistate { dirty_count = DCount, |