Merge branch 'stable'

Author: michaelklishin

src/rabbit.erl

@@ -621,6 +621,8 @@ decrypt_list([{Key, Value}|Tail], Algo, Acc) when Key =/= encrypted ->
 decrypt_list([Value|Tail], Algo, Acc) ->
     decrypt_list(Tail, Algo, [decrypt(Value, Algo)|Acc]).
 
+stop_apps([]) ->
+    ok;
 stop_apps(Apps) ->
     rabbit_log:info(
         lists:flatten(["Stopping RabbitMQ applications and their dependencies in the following order:~n",

src/rabbit_plugins.erl

@@ -64,8 +64,19 @@ ensure(FileJustChanged0) ->
                                                             {disabled, Stop}]),
             rabbit:stop_apps(Stop),
             clean_plugins(Stop),
-            rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n",
-                            [Start, Stop]),
+            case {Start, Stop} of
+                {[], []} ->
+                    ok;
+                {[], _} ->
+                    rabbit_log:info("Plugins changed; disabled ~p~n",
+                                    [Stop]);
+                {_, []} ->
+                    rabbit_log:info("Plugins changed; enabled ~p~n",
+                                    [Start]);
+                {_, _} ->
+                    rabbit_log:info("Plugins changed; enabled ~p, disabled ~p~n",
+                                    [Start, Stop])
+            end,
             {ok, Start, Stop};
         _ ->
             {error, {enabled_plugins_mismatch, FileJustChanged, OurFile}}