summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-06-30 17:38:19 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-06-30 17:38:19 +0100
commit6bad1a486a8aecaead8fe1d77c3b414ab920884b (patch)
tree1553b6484ec43c7a23ea1831369b772503b5ad3c
parentec28eca027504b57fcfe835705b248caef4fbdaf (diff)
downloadrabbitmq-server-bug22918.tar.gz
Rename no_delete to not_deleted, makes things clearer.bug22918
-rw-r--r--src/rabbit_exchange.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index ef818ef4..d77bf833 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -335,7 +335,7 @@ delete_queue_bindings(QueueName, FwdDeleteFun) ->
Module = type_to_module(Type),
case IsDeleted of
auto_deleted -> Module:delete(X, Bs);
- no_delete -> Module:remove_bindings(X, Bs)
+ not_deleted -> Module:remove_bindings(X, Bs)
end
end, Cleanup)
end.
@@ -442,7 +442,7 @@ delete_binding(ExchangeName, QueueName, RoutingKey, Arguments, InnerFun) ->
Module = type_to_module(Type),
case IsDeleted of
auto_deleted -> Module:delete(X, [B]);
- no_delete -> Module:remove_bindings(X, [B])
+ not_deleted -> Module:remove_bindings(X, [B])
end
end.
@@ -526,10 +526,10 @@ delete(ExchangeName, IfUnused) ->
end.
maybe_auto_delete(Exchange = #exchange{auto_delete = false}) ->
- {no_delete, Exchange};
+ {not_deleted, Exchange};
maybe_auto_delete(Exchange = #exchange{auto_delete = true}) ->
case conditional_delete(Exchange) of
- {error, in_use} -> {no_delete, Exchange};
+ {error, in_use} -> {not_deleted, Exchange};
{deleted, Exchange, []} -> {auto_deleted, Exchange}
end.