summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit.app.src2
-rw-r--r--src/rabbit_queue_consumers.erl4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit.app.src b/src/rabbit.app.src
index 76be5beb46..18726c71e8 100644
--- a/src/rabbit.app.src
+++ b/src/rabbit.app.src
@@ -9,7 +9,7 @@
rabbit_router,
rabbit_sup,
rabbit_direct_client_sup]},
- {applications, [kernel, stdlib, sasl, mnesia, rabbit_common, ranch, os_mon, xmerl, uuid]},
+ {applications, [kernel, stdlib, sasl, mnesia, rabbit_common, ranch, os_mon, xmerl]},
%% we also depend on crypto, public_key and ssl but they shouldn't be
%% in here as we don't actually want to start it
{mod, {rabbit, []}},
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) ->