diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-12 12:52:57 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-12 12:52:57 +0000 |
| commit | 615d2ce187a69735772f98af7d3d225569873286 (patch) | |
| tree | 60d6c06653f1632a69ce150b71c6639063f0d48c | |
| parent | bce6f6c871c8722726d1df5965bbd74cdb5e59ea (diff) | |
| download | rabbitmq-server-615d2ce187a69735772f98af7d3d225569873286.tar.gz | |
correct another return
| -rw-r--r-- | src/rabbit_reader.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index d4cd0586..e33c6de2 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -507,14 +507,13 @@ terminate_channels(#v1{channel_count = ChannelCount} = State) -> TimerRef = erlang:send_after(Timeout, self(), cancel_wait), wait_for_channel_termination(ChannelCount, TimerRef, State). -wait_for_channel_termination(0, TimerRef, _State) -> +wait_for_channel_termination(0, TimerRef, State) -> case erlang:cancel_timer(TimerRef) of false -> receive - cancel_wait -> ok + cancel_wait -> State end; - _ -> ok + _ -> State end; - wait_for_channel_termination(N, TimerRef, State) -> receive {'DOWN', _MRef, process, ChPid, Reason} -> |