summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-12-04 16:48:34 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-12-04 16:48:34 +0000
commite979532601ea2f44fdc54179be8be27d5a09db16 (patch)
treeeccbf05f843be59383bda655d4e6afef39439641
parent6923004b2a25cf5e7e0006e1d734d395691e56b6 (diff)
downloadrabbitmq-server-e979532601ea2f44fdc54179be8be27d5a09db16.tar.gz
Don't leak on noack.
-rw-r--r--src/rabbit_variable_queue.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index c703d3b9..f2fd0388 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -1239,9 +1239,10 @@ remove(AckRequired, MsgStatus = #msg_status {
end,
Ack = fun () -> rabbit_queue_index:ack([SeqId], IndexState1) end,
IndexState2 = case {AckRequired, MsgInStore, IndexOnDisk} of
- {false, true, false} -> Rem(), IndexState1;
- {false, true, true} -> Rem(), Ack();
- _ -> IndexState1
+ {false, true, false} -> Rem(), IndexState1;
+ {false, true, true} -> Rem(), Ack();
+ {false, false, true} -> Ack();
+ _ -> IndexState1
end,
%% 3. If an ack is required, add something sensible to PA