summaryrefslogtreecommitdiff
path: root/src
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
commitd2b579f2ef05a327c2ec105c7ce32a027cbc2410 (patch)
treea42dc4bfa30086fb8415372bf80f0032ffc8946f /src
parent81884f39b9333553e7790832c0f4d729e417e910 (diff)
downloadrabbitmq-server-git-d2b579f2ef05a327c2ec105c7ce32a027cbc2410.tar.gz
Remove duplication in queue deletion callback
Diffstat (limited to 'src')
-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 b2b365ad43..9d3d6d5f2f 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.