diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-04-18 18:37:24 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-04-18 18:37:24 +0100 |
| commit | 051c149653879f522625f4937df6031642346c7d (patch) | |
| tree | 41115ec01ddf350ff94886b7b2fa019d6f929329 /src | |
| parent | 5e34a2b37c661187b438bdf7105a3f9af4de72f5 (diff) | |
| parent | 7ec07ac1182078736a2eaada57040624e295f934 (diff) | |
| download | rabbitmq-server-git-051c149653879f522625f4937df6031642346c7d.tar.gz | |
merge bug24874 into default
Diffstat (limited to 'src')
| -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 0bfec2fd80..f9315c5dff 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -589,10 +589,10 @@ dropwhile(Pred, MsgFun, State) -> {_, State2} = internal_fetch(false, MsgStatus, State1), dropwhile(Pred, MsgFun, State2); {true, _} -> - {{_, _, AckTag, _}, State2} = - internal_fetch(true, MsgStatus, State1), - {MsgStatus, State3} = read_msg(MsgStatus, State2), - MsgFun(MsgStatus#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)) |