summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-02-03 16:23:35 +0000
committerMatthew Sackman <matthew@lshift.net>2010-02-03 16:23:35 +0000
commit2aa5024266f75dad4e91ad9fa2537f05be8df718 (patch)
tree664d840eae347ec065e1f8d5d5568aedb0558b1b
parentff6abb689eb0f72926f3e8947ecdb05306952a00 (diff)
downloadrabbitmq-server-git-2aa5024266f75dad4e91ad9fa2537f05be8df718.tar.gz
One fix for a missing error possibility. Another fix for the spec of table fold. Dialyzer now happy
-rw-r--r--src/rabbit_exchange.erl4
-rw-r--r--src/rabbit_misc.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index 8dff804445..10d2f5d8ee 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -498,8 +498,8 @@ delete(ExchangeName, IfUnused) ->
{deleted, X = #exchange{ type = Type }, Bs} ->
(type_to_module(Type)):delete(X, Bs),
ok;
- InUse = {error, in_use} ->
- InUse
+ Error = {error, _InUseOrNotFound} ->
+ Error
end.
maybe_auto_delete(Exchange = #exchange{auto_delete = false}) ->
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index dc1afa64d6..bccee2a70f 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -113,7 +113,7 @@
-spec(intersperse/2 :: (A, [A]) -> [A]).
-spec(upmap/2 :: (fun ((A) -> B), [A]) -> [B]).
-spec(map_in_order/2 :: (fun ((A) -> B), [A]) -> [B]).
--spec(table_fold/3 :: (fun ((any()) -> any()), any(), atom()) -> any()).
+-spec(table_fold/3 :: (fun ((any(), A) -> A), A, atom()) -> A).
-spec(dirty_read_all/1 :: (atom()) -> [any()]).
-spec(dirty_foreach_key/2 :: (fun ((any()) -> any()), atom()) ->
'ok' | 'aborted').