summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-09-07 13:51:16 +0200
committerAlvaro Videla <videlalvaro@gmail.com>2015-09-07 13:51:16 +0200
commit09c2922c4200a3af98a080d8c23bc98c8321bd9d (patch)
treeeae2ded26c2bce2b8fe34c57972d8968636e12ce
parentf2028a09f5a1c7cc1a306e59d25b3ad8c42494b8 (diff)
downloadrabbitmq-server-git-09c2922c4200a3af98a080d8c23bc98c8321bd9d.tar.gz
uses purge_when_no_pending_acks for delete_and_terminate
-rw-r--r--src/rabbit_variable_queue.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 1434cd17c2..f3c73f49fc 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -537,7 +537,7 @@ delete_and_terminate(_Reason, State) ->
%% part of 'purge' and 'purge_pending_ack', other than deleting
%% it. That's why the last parameter to those functions is delete
%% and terminate.
- {_PurgeCount, State1} = purge(State),
+ State1 = purge_when_no_pending_acks(State),
State2 = #vqstate { msg_store_clients = {MSCStateP, MSCStateT} } =
purge_pending_ack(false, State1, true),
case MSCStateP of