diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-15 16:14:14 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-15 16:14:14 +0000 |
| commit | 81097e2b80cb2a31fb285f87b57c6440d1565e05 (patch) | |
| tree | 6bc9f17cac3a937af94f64a1c95c13794c5f8b0c | |
| parent | d8f3b60cd86d708abf4736f2e9acc04ab9a2f94a (diff) | |
| download | rabbitmq-server-81097e2b80cb2a31fb285f87b57c6440d1565e05.tar.gz | |
make reader's handle_dependent_exit clearer
- handle the no-op case (controlled exit of a channel we've forgotten
about already) explicitly
- better clause order and formatting.
| -rw-r--r-- | src/rabbit_reader.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index af7aac6f..f249bc9b 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -437,13 +437,13 @@ close_connection(State = #v1{queue_collector = Collector, handle_dependent_exit(ChPid, Reason, State) -> case {channel_cleanup(ChPid), termination_kind(Reason)} of - {undefined, uncontrolled} -> - exit({abnormal_dependent_exit, ChPid, Reason}); - {_Channel, controlled} -> - maybe_close(control_throttle(State)); - {Channel, uncontrolled} -> - maybe_close(handle_exception(control_throttle(State), - Channel, Reason)) + {undefined, controlled} -> State; + {undefined, uncontrolled} -> exit({abnormal_dependent_exit, + ChPid, Reason}); + {_Channel, controlled} -> maybe_close(control_throttle(State)); + {Channel, uncontrolled} -> maybe_close( + handle_exception(control_throttle(State), + Channel, Reason)) end. terminate_channels() -> |