diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-04-18 17:34:56 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-04-18 17:34:56 +0100 |
| commit | 7ec07ac1182078736a2eaada57040624e295f934 (patch) | |
| tree | 1ac4e36a454e3e7c0a5fc6f17e9078ff636c65a4 | |
| parent | ee883089b47bf5ecdaf2be37981b1aad9783e100 (diff) | |
| download | rabbitmq-server-git-7ec07ac1182078736a2eaada57040624e295f934.tar.gz | |
Consistency between dropwhile and internal_fetch
| -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 b6b1f7f30a..d622642b87 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -591,10 +591,10 @@ dropwhile(Pred, MsgFun, State) -> {_, State2} = internal_fetch(false, MsgStatus, State1), dropwhile(Pred, MsgFun, State2); {true, _} -> - {{_, _, AckTag, _}, State2} = - internal_fetch(true, MsgStatus, State1), - {MsgStatus1, State3} = read_msg(MsgStatus, State2), - MsgFun(MsgStatus1#msg_status.msg, AckTag), + {MsgStatus1, State2} = read_msg(MsgStatus, State1), + {{Msg, _, AckTag, _}, State3} = + internal_fetch(true, MsgStatus1, State2), + MsgFun(Msg, AckTag), dropwhile(Pred, MsgFun, State3); {false, _} -> a(in_r(MsgStatus, State1)) |