diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-06-27 14:52:21 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-06-27 14:52:21 +0100 |
| commit | 63a164675ed039f00f3861e8074e64b02d4423de (patch) | |
| tree | a8cf7b486b08786117fe3c232f6b25b58915517c | |
| parent | a2062549818ef617b03e1414ad274b4fac960fc8 (diff) | |
| parent | c6b0630ca1249f1a2bf4210feec2c788550ee2a4 (diff) | |
| download | rabbitmq-server-63a164675ed039f00f3861e8074e64b02d4423de.tar.gz | |
merge bug 24221 into default (channel.flow{active=true} can fail to unblock queues)
| -rw-r--r-- | src/rabbit_limiter.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index 1b72dd76..e79583fa 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -120,9 +120,9 @@ init([ChPid, UnackedMsgCount]) -> prioritise_call(get_limit, _From, _State) -> 9; prioritise_call(_Msg, _From, _State) -> 0. -handle_call({can_send, _QPid, _AckRequired}, _From, +handle_call({can_send, QPid, _AckRequired}, _From, State = #lim{blocked = true}) -> - {reply, false, State}; + {reply, false, limit_queue(QPid, State)}; handle_call({can_send, QPid, AckRequired}, _From, State = #lim{volume = Volume}) -> case limit_reached(State) of |