diff options
| -rw-r--r-- | src/rabbit_channel.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 01f41a0c9d..703a069077 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 c3d0b7b786..68ffc98ad7 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 |