diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2010-02-23 15:06:54 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2010-02-23 15:06:54 +0000 |
| commit | 93f26e835c510214f2f7597c904efc0e2f27c63b (patch) | |
| tree | 82f60709332caa99b72230e8a72a983aab61ad9d | |
| parent | b6b5c6fe0f87054070395db66d116543d2dad485 (diff) | |
| parent | 1cfbca8cea3bfafaf80292fa998ac45fee629d1f (diff) | |
| download | rabbitmq-server-git-93f26e835c510214f2f7597c904efc0e2f27c63b.tar.gz | |
Merge heads
| -rw-r--r-- | src/rabbit_exchange.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange_type_registry.erl | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 58f71662bd..aa4a7d29d5 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -506,7 +506,7 @@ maybe_auto_delete(Exchange = #exchange{auto_delete = false}) -> {no_delete, Exchange}; maybe_auto_delete(Exchange = #exchange{auto_delete = true}) -> case conditional_delete(Exchange) of - {error, in_use} -> {no_delete, Exchange}; + {error, in_use} -> {no_delete, Exchange}; {deleted, Exchange, []} -> {auto_deleted, Exchange} end. diff --git a/src/rabbit_exchange_type_registry.erl b/src/rabbit_exchange_type_registry.erl index 6517b5e906..175d15ad83 100644 --- a/src/rabbit_exchange_type_registry.erl +++ b/src/rabbit_exchange_type_registry.erl @@ -48,12 +48,10 @@ -spec(start_link/0 :: () -> 'ignore' | {'error', term()} | {'ok', pid()}). -spec(register/2 :: (binary(), atom()) -> 'ok'). -spec(binary_to_type/1 :: (binary()) -> atom() | {'error', 'not_found'}). --spec(lookup_module/1 :: (atom()) -> {'ok', atom()} | {'error', 'not_found'}). +-spec(lookup_module/1 :: (atom()) -> {'ok', atom()} | {'error', 'not_found'}). -endif. -%% TODO specs - %%--------------------------------------------------------------------------- start_link() -> |