merge with default

1 files changed, 12 insertions, 15 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 25a061ac..853a409e 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -449,24 +449,21 @@ flush_all(QPids, ChPid) ->
 internal_delete1(QueueName) ->
     ok = mnesia:delete({rabbit_queue, QueueName}),
     ok = mnesia:delete({rabbit_durable_queue, QueueName}),
-    %% we want to execute some things, as
-    %% decided by rabbit_exchange, after the
-    %% transaction.
+    %% we want to execute some things, as decided by rabbit_exchange,
+    %% after the transaction.
     rabbit_binding:remove_for_queue(QueueName).
 
 internal_delete(QueueName) ->
-    case
-        rabbit_misc:execute_mnesia_transaction(
-          fun () ->
-                  case mnesia:wread({rabbit_queue, QueueName}) of
-                      []  -> {error, not_found};
-                      [_] -> internal_delete1(QueueName)
-                  end
-          end) of
-        Err = {error, _} -> Err;
-        PostHook ->
-            PostHook(),
-            ok
+    case rabbit_misc:execute_mnesia_transaction(
+           fun () ->
+                   case mnesia:wread({rabbit_queue, QueueName}) of
+                       []  -> {error, not_found};
+                       [_] -> internal_delete1(QueueName)
+                   end
+           end) of
+        {error, _} = Err -> Err;
+        PostHook         -> PostHook(),
+                            ok
     end.
 
 maybe_run_queue_via_backing_queue(QPid, Fun) ->