diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-04-14 14:54:51 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-04-14 14:54:51 +0100 |
| commit | eddc7dc7b9c93abb8e9f1c24f0ce6e92ab0a4bc3 (patch) | |
| tree | ff1c9a2e6baf9896d7d7c1a9c5946b1f71e8f013 /src | |
| parent | 16186562f5b7b91158772f6eaae8f87e7f85fedd (diff) | |
| download | rabbitmq-server-git-eddc7dc7b9c93abb8e9f1c24f0ce6e92ab0a4bc3.tar.gz | |
Backed out changeset 4ee61cc2d6f0
This was committed directly on 'default' in error.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index c43efbedef..7574cd673a 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -578,7 +578,7 @@ handle_method(#'exchange.delete'{exchange = ExchangeNameBin, ExchangeName = rabbit_misc:r(VHostPath, exchange, ExchangeNameBin), check_configure_permitted(ExchangeName, State), case rabbit_exchange:delete(ExchangeName, IfUnused) of - {error, exchange_not_found} -> + {error, not_found} -> rabbit_misc:protocol_error( not_found, "no ~s", [rabbit_misc:rs(ExchangeName)]); {error, in_use} -> diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 6b33def451..a57e8076bf 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -90,7 +90,7 @@ -spec(topic_matches/2 :: (binary(), binary()) -> bool()). -spec(headers_match/2 :: (amqp_table(), amqp_table()) -> bool()). -spec(delete/2 :: (exchange_name(), bool()) -> - 'ok' | {'error', 'exchange_not_found'} | {'error', 'in_use'}). + 'ok' | not_found() | {'error', 'in_use'}). -spec(list_queue_bindings/1 :: (queue_name()) -> [{exchange_name(), routing_key(), amqp_table()}]). -spec(list_exchange_bindings/1 :: (exchange_name()) -> |