summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-02-15 18:55:22 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-02-15 18:55:22 +0000
commit25118198ee266ce6864eef53740fa9346d97af45 (patch)
tree8a07415975e9d736cb3540196d8cfa73d06651cf /src
parent9028ebe3094681fdf6f2efb9f98c36cb155f8b02 (diff)
downloadrabbitmq-server-git-25118198ee266ce6864eef53740fa9346d97af45.tar.gz
refactor: more symmetry in rabbit_reader:handle_dependent_exit/3
It makes no difference whether we call handle_exception before or after control_throttle, so lets use an order that more clearly calls out the similarity to the controlled exit case.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index d2655a905c..203ec3f0c4 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -441,9 +441,9 @@ handle_dependent_exit(ChPid, Reason, 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))
+ {Channel, uncontrolled} -> State1 = handle_exception(
+ State, Channel, Reason),
+ maybe_close(control_throttle(State1))
end.
terminate_channels() ->