diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-14 15:56:28 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-14 15:56:28 +0100 |
| commit | a3d42df9d459b1afad4bc03be9ae2d27ef94843f (patch) | |
| tree | 54f40153d74cdeb67abbb7695117f5d962eff480 | |
| parent | b8c7d7e3d7629b9bc7eeba9c9ec45a556708b493 (diff) | |
| download | rabbitmq-server-git-a3d42df9d459b1afad4bc03be9ae2d27ef94843f.tar.gz | |
cosmetic: more sensible order
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 625c34513e..8799fff31a 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -488,10 +488,10 @@ fetch(AckRequired, State = #vqstate { q4 = Q4, Rem = fun () -> ok = rabbit_msg_store:remove(MsgStore, [Guid]) end, Ack = fun () -> rabbit_queue_index:ack([SeqId], IndexState1) end, IndexState2 = - case {MsgOnDisk, IndexOnDisk, AckRequired, IsPersistent} of - {true, false, false, _} -> Rem(), IndexState1; - {true, true, false, _} -> Rem(), Ack(); - {true, true, true, false} -> Ack(); + case {AckRequired, MsgOnDisk, IndexOnDisk, IsPersistent} of + {false, true, false, _} -> Rem(), IndexState1; + {false, true, true, _} -> Rem(), Ack(); + { true, true, true, false} -> Ack(); _ -> IndexState1 end, |