diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-05-27 14:32:17 +0100 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-05-27 14:32:17 +0100 |
| commit | b8fcc6c9cee25635a25c3f44dd3f1a1baa758449 (patch) | |
| tree | a17f8993ae059c09624309f16e960aafaf96adb5 /src/rabbit_channel.erl | |
| parent | e75a9bce465ae68efd8b90d042c605b4b90cc8d9 (diff) | |
| parent | 77b82d6213b973473085aa5224abb9b06c2a7936 (diff) | |
| download | rabbitmq-server-b8fcc6c9cee25635a25c3f44dd3f1a1baa758449.tar.gz | |
merge default into bug20654
Diffstat (limited to 'src/rabbit_channel.erl')
| -rw-r--r-- | src/rabbit_channel.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index ff0ca704..738e9017 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -605,8 +605,7 @@ handle_method(#'exchange.delete'{exchange = ExchangeNameBin, check_configure_permitted(ExchangeName, State), case rabbit_exchange:delete(ExchangeName, IfUnused) of {error, not_found} -> - rabbit_misc:protocol_error( - not_found, "no ~s", [rabbit_misc:rs(ExchangeName)]); + rabbit_misc:not_found(ExchangeName); {error, in_use} -> die_precondition_failed( "~s in use", [rabbit_misc:rs(ExchangeName)]); @@ -772,11 +771,9 @@ binding_action(Fun, ExchangeNameBin, QueueNameBin, RoutingKey, Arguments, check_read_permitted(ExchangeName, State), case Fun(ExchangeName, QueueName, ActualRoutingKey, Arguments) of {error, exchange_not_found} -> - rabbit_misc:protocol_error( - not_found, "no ~s", [rabbit_misc:rs(ExchangeName)]); + rabbit_misc:not_found(ExchangeName); {error, queue_not_found} -> - rabbit_misc:protocol_error( - not_found, "no ~s", [rabbit_misc:rs(QueueName)]); + rabbit_misc:not_found(QueueName); {error, exchange_and_queue_not_found} -> rabbit_misc:protocol_error( not_found, "no ~s and no ~s", [rabbit_misc:rs(ExchangeName), |