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 | 3b5b393f060f3758e5c7802767b20fb6f46e0d9c (patch) | |
| tree | a8cf7b486b08786117fe3c232f6b25b58915517c | |
| parent | ce9ffa11b95435227c8e7b8d18c41a5c3189ac52 (diff) | |
| parent | 8cbced41a42542001f64a5fb2d8526965583ae02 (diff) | |
| download | rabbitmq-server-git-3b5b393f060f3758e5c7802767b20fb6f46e0d9c.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 1b72dd761a..e79583fa89 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 |