List comprehension in Mnesia upgrade functions to cut code duplication.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl
index bf8e3a1f..af3996c2 100644
--- a/src/rabbit_upgrade_functions.erl
+++ b/src/rabbit_upgrade_functions.erl
@@ -74,18 +74,16 @@ add_ip_to_listener() ->
       [node, protocol, host, ip_address, port]).
 
 add_internal_to_exchange_and_durable_exchange() ->
+    Tables = [rabbit_exchange, rabbit_durable_exchange],
     AddInternalFun =
         fun ({exchange, Name, Type, Durable, AutoDelete, Args}) ->
                 {exchange, Name, Type, Durable, AutoDelete, false, Args}
         end,
-    ok = mnesia(
-           rabbit_exchange,
-           AddInternalFun,
-           [name, type, durable, auto_delete, internal, arguments]),
-    mnesia(
-      rabbit_durable_exchange,
-      AddInternalFun,
-      [name, type, durable, auto_delete, internal, arguments]).
+    [ ok = mnesia(T,
+                  AddInternalFun,
+                  [name, type, durable, auto_delete, internal, arguments])
+      || T <- Tables ],
+    ok.
 
 %%--------------------------------------------------------------------