summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-06-29 16:44:03 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-06-29 16:44:03 +0100
commit1467ba4646df2ffed9848431613a0d4e1bb5fda9 (patch)
tree53c554f139809d5261290791530d76d1019ce252
parentac87cd4aec22dafad101d5b415b793631feda50d (diff)
downloadrabbitmq-server-1467ba4646df2ffed9848431613a0d4e1bb5fda9.tar.gz
Cosmetic
-rw-r--r--src/rabbit_channel.erl12
-rw-r--r--src/rabbit_networking.erl2
2 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 01f41a0c..703a0690 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -297,13 +297,11 @@ return_queue_declare_ok(Q = #amqqueue{name = #resource{name = ActualName}},
end,
NewState = State#ch{most_recently_declared_queue = ActualName},
case NoWait of
- true ->
- {noreply, NewState};
- false ->
- Reply = #'queue.declare_ok'{queue = ActualName,
- message_count = MessageCount,
- consumer_count = ConsumerCount},
- {reply, Reply, NewState}
+ true -> {noreply, NewState};
+ false -> Reply = #'queue.declare_ok'{queue = ActualName,
+ message_count = MessageCount,
+ consumer_count = ConsumerCount},
+ {reply, Reply, NewState}
end.
check_resource_access(Username, Resource, Perm) ->
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index c3d0b7b7..68ffc98a 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -102,7 +102,7 @@ boot_ssl() ->
{ok, []} ->
ok;
{ok, SslListeners} ->
- ok = rabbit_misc:start_applications([crypto, ssl]),
+ ok = rabbit_misc:start_applications([crypto, public_key, ssl]),
{ok, SslOpts} = application:get_env(ssl_options),
[start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners],
ok