diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2011-03-16 13:15:51 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2011-03-16 13:15:51 +0000 |
commit | a65e7a57cb8f5bf4c4fe562d3ac3dae2a06f7ffd (patch) | |
tree | 42564d8d00e2466198b04bac380b96560ffa535d | |
parent | ff296ce8d6523280e25dbcb81b3fc82bdcaf7bb5 (diff) | |
download | rabbitmq-server-a65e7a57cb8f5bf4c4fe562d3ac3dae2a06f7ffd.tar.gz |
Try to make this branch vertical space neutral. Sadly we can't do this by planting a vertical space tree.
-rw-r--r-- | src/rabbit_channel.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 19b2eaf4..370654a9 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1144,7 +1144,7 @@ handle_consuming_queue_down(MRef, ConsumerTag, binding_action(Fun, ExchangeNameBin, DestinationType, DestinationNameBin, RoutingKey, Arguments, ReturnMethod, NoWait, State = #ch{virtual_host = VHostPath, - connection_pid = ConnectionPid }) -> + connection_pid = ConnPid }) -> %% FIXME: connection exception (!) on failure?? %% (see rule named "failure" in spec-XML) %% FIXME: don't allow binding to internal exchanges - @@ -1160,8 +1160,7 @@ binding_action(Fun, ExchangeNameBin, DestinationType, DestinationNameBin, key = ActualRoutingKey, args = Arguments}, fun (_X, Q = #amqqueue{}) -> - try rabbit_amqqueue:check_exclusive_access(Q, - ConnectionPid) + try rabbit_amqqueue:check_exclusive_access(Q, ConnPid) catch exit:Reason -> {error, Reason} end; (_X, #exchange{}) -> |