From 23de2b4e37beee15d70b9095ff781014e4cf03c2 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Tue, 7 May 2013 15:20:40 +0100 Subject: Remove assertion; it's not always correct if prefetch has been set before. Instead, only set the volume when we have not set prefetch before. --- src/rabbit_limiter.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index d9f1170e..1e32f95a 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -324,12 +324,12 @@ prioritise_call(_Msg, _From, _Len, _State) -> 0. handle_call({new, ChPid}, _From, State = #lim{ch_pid = undefined}) -> {reply, ok, State#lim{ch_pid = ChPid}}; -handle_call({limit_prefetch, PrefetchCount, UnackedCount}, _From, State) -> - %% assertion - true = State#lim.prefetch_count == 0 orelse - State#lim.volume == UnackedCount, +handle_call({limit_prefetch, PrefetchCount, UnackedCount}, _From, + State = #lim{prefetch_count = 0}) -> {reply, ok, maybe_notify(State, State#lim{prefetch_count = PrefetchCount, volume = UnackedCount})}; +handle_call({limit_prefetch, PrefetchCount, _UnackedCount}, _From, State) -> + {reply, ok, maybe_notify(State, State#lim{prefetch_count = PrefetchCount})}; handle_call(unlimit_prefetch, _From, State) -> {reply, ok, maybe_notify(State, State#lim{prefetch_count = 0, -- cgit v1.2.1