summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-11-17 14:35:45 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-11-17 14:35:45 +0000
commitf6d111c331105058281d1ad802b45e5e2820ca77 (patch)
tree579d584896b037e8f526ba6c8a30c502a0b8c678
parentfe58685b8ef6f05523f77c22ceeeb63cf40190d0 (diff)
downloadrabbitmq-server-git-f6d111c331105058281d1ad802b45e5e2820ca77.tar.gz
fix confirm after basic.reject{requeue=false}
-rw-r--r--src/rabbit_variable_queue.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 9b3cc58aaa..abad3adb21 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -624,8 +624,9 @@ ack(AckTags, State) ->
{Guids, State1} =
ack(fun msg_store_remove/3,
fun ({_IsPersistent, Guid, _MsgProps}, State1) ->
- remove_confirms(gb_sets:singleton(Guid), State1),
- State1
+ remove_confirms(gb_sets:singleton(Guid), State1);
+ (#msg_status{msg = #basic_message{guid = Guid}}, State1) ->
+ remove_confirms(gb_sets:singleton(Guid), State1)
end,
AckTags, State),
{Guids, a(State1)}.