diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-01-09 14:52:41 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-01-09 14:52:41 +0000 |
| commit | 4014babf9c436b985a190baa5fc05ffc1db05783 (patch) | |
| tree | 203dca0760c2898eb173f85f39ce92b2ffa39726 | |
| parent | d5d767375b99934047b6f12e99ea63a7d414255c (diff) | |
| download | rabbitmq-server-git-4014babf9c436b985a190baa5fc05ffc1db05783.tar.gz | |
I added that clause early in the history of this bug and it's always been wrong. The semantics of that line are just "set is_limit_active to false if the limiter is disabled", is_blocked (which only deals with the channel.flow case anyway) has nothing to do with it.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 08a1ca70b0..87b93d174f 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1249,8 +1249,7 @@ handle_cast({limit, ChPid, Limiter}, State) -> true -> ok = rabbit_limiter:register(Limiter, self()); false -> ok end, - Limited = OldLimited andalso rabbit_limiter:is_enabled(Limiter) - andalso rabbit_limiter:is_blocked(Limiter), + Limited = OldLimited andalso rabbit_limiter:is_enabled(Limiter), C#cr{limiter = Limiter, is_limit_active = Limited} end)); |