From 79e0804661b83c72d105db883efffd335963bb32 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@lshift.net>
Date: Wed, 26 May 2010 17:21:57 +0100
Subject: Don't eat errors that could be returned by F.

---
 src/rabbit_channel.erl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 3db0f95ec0..2751f5b7ea 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -305,18 +305,18 @@ with_exclusive_access_or_die(QName, ReaderPid, F) ->
                          F(Q);
                      #amqqueue{exclusive_owner = ReaderPid} ->
                          F(Q);
-                     E ->
-                         {error, E}
+                     _ ->
+                         {error, wrong_exclusive_owner}
                  end
          end,
     case rabbit_amqqueue:with_or_die(QName, F2) of
-        {error, _} ->
+        {error, wrong_exclusive_owner} ->
             rabbit_misc:protocol_error(
               resource_locked,
               "cannot obtain exclusive access to locked ~s",
               [rabbit_misc:rs(QName)]);
-        Q ->
-            Q
+        Else ->
+            Else
     end.
 
 expand_queue_name_shortcut(<<>>, #ch{ most_recently_declared_queue = <<>> }) ->
-- 
cgit v1.2.1