diff options
| author | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-13 17:34:05 -0400 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@kcbbs.gen.nz> | 2009-04-13 17:34:05 -0400 |
| commit | 16186562f5b7b91158772f6eaae8f87e7f85fedd (patch) | |
| tree | bf481009fd0338906e793639c77728ada0191c30 /src | |
| parent | 40cc23ce4796a38bfddaac1d11e568ca1fc282c0 (diff) | |
| download | rabbitmq-server-git-16186562f5b7b91158772f6eaae8f87e7f85fedd.tar.gz | |
Fix double-exchange-deletion bug
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 7574cd673a..c43efbedef 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, 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 a57e8076bf..6b33def451 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' | 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()) -> |