summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2010-02-19 17:08:11 +0000
committerMichael Bridgen <mikeb@lshift.net>2010-02-19 17:08:11 +0000
commitf9d397dc015519b08854e2fe930f7f4a0f13c899 (patch)
treea42dc4bfa30086fb8415372bf80f0032ffc8946f
parent0f61fe9158006bea3015ca619cd3c230abbfe233 (diff)
downloadrabbitmq-server-f9d397dc015519b08854e2fe930f7f4a0f13c899.tar.gz
Remove duplication in queue deletion callback
-rw-r--r--src/rabbit_exchange.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index b2b365ad..9d3d6d5f 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -304,13 +304,13 @@ delete_queue_bindings(QueueName, FwdDeleteFun) ->
none, [], []),
fun () ->
lists:foreach(
- fun ({{auto_deleted, X = #exchange{ type = Type }}, Bs}) ->
+ fun ({{IsDeleted, X = #exchange{ type = Type }}, Bs}) ->
Module = type_to_module(Type),
[Module:delete_binding(X, B) || B <- Bs],
- Module:delete(X, []);
- ({{no_delete, X = #exchange{ type = Type }}, Bs}) ->
- Module = type_to_module(Type),
- [Module:delete_binding(X, B) || B <- Bs]
+ case IsDeleted of
+ auto_deleted -> Module:delete(X, []);
+ no_delete -> ok
+ end
end, Cleanup)
end.