diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-13 17:34:32 -0400 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-13 17:34:32 -0400 |
| commit | 8166ccce9ec26136743f8be22792d693b0f3f45d (patch) | |
| tree | eb7e89393c073b8ebc0345510c7fc8c5de7e245f | |
| parent | 397a7ed46b9f7ea4affd38230cf2daf786e4825f (diff) | |
| parent | 16186562f5b7b91158772f6eaae8f87e7f85fedd (diff) | |
| download | rabbitmq-server-git-8166ccce9ec26136743f8be22792d693b0f3f45d.tar.gz | |
merge default into amqp_0_9_1
| -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 078c160265..a9fcd8e01a 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -573,7 +573,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, not_found} -> + {error, exchange_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 c523eda3c0..493bc365d5 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -89,7 +89,7 @@ -spec(topic_matches/2 :: (binary(), binary()) -> bool()). -spec(headers_match/2 :: (amqp_table(), amqp_table()) -> bool()). -spec(delete/2 :: (exchange_name(), bool()) -> - 'ok' | not_found() | {'error', 'in_use'}). + 'ok' | {'error', 'exchange_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()) -> |