summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2015-12-14 23:47:52 +0300
committerMichael Klishin <michael@novemberain.com>2015-12-14 23:47:52 +0300
commitacada7b166f6ccdda80a9a73c33162c43fddf80b (patch)
treef07bbc5965b6dcf9b5e20ee4dc838a2259e2e3dd
parentde9f60af016198973ed163b1586b9838eb194228 (diff)
parent869640358a3e269704c0a6338f2014d9265a72c3 (diff)
downloadrabbitmq-server-git-acada7b166f6ccdda80a9a73c33162c43fddf80b.tar.gz
Merge pull request #496 from rabbitmq/rabbitmq-server-255
Ignore unknown channel acks in queue
-rw-r--r--src/rabbit_queue_consumers.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl
index 3ba9f89205..29fc74dc52 100644
--- a/src/rabbit_queue_consumers.erl
+++ b/src/rabbit_queue_consumers.erl
@@ -281,7 +281,9 @@ subtract_acks([T | TL] = AckTags, Prefix, CTagCounts, AckQ) ->
subtract_acks(TL, Prefix,
orddict:update_counter(CTag, 1, CTagCounts), QTail);
{{value, V}, QTail} ->
- subtract_acks(AckTags, [V | Prefix], CTagCounts, QTail)
+ subtract_acks(AckTags, [V | Prefix], CTagCounts, QTail);
+ {empty, _} ->
+ subtract_acks([], Prefix, CTagCounts, AckQ)
end.
possibly_unblock(Update, ChPid, State) ->