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 | 0ecafa1504539aa01798c05e35dab7ec0a354350 (patch) | |
| tree | 41115ec01ddf350ff94886b7b2fa019d6f929329 | |
| parent | 690b4035e81a546cc20fe240fdb9192cf0f2175c (diff) | |
| parent | aee4339d6a1c6d35bac02de290ff919c2c32d95c (diff) | |
| download | rabbitmq-server-0ecafa1504539aa01798c05e35dab7ec0a354350.tar.gz | |
merge bug24874 into default
| -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 0bfec2fd..f9315c5d 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)) |