summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-05-26 17:21:57 +0100
committerSimon MacMullen <simon@lshift.net>2010-05-26 17:21:57 +0100
commit7e218ebbe9b8014082fda807049b9bab795b2abe (patch)
tree5714dff9dc663a8fc58813cd30d66edd3d816230
parentdab9c1fcdb0c8056ae2d784e5eb3a56cb3c7e8aa (diff)
downloadrabbitmq-server-7e218ebbe9b8014082fda807049b9bab795b2abe.tar.gz
Don't eat errors that could be returned by F.
-rw-r--r--src/rabbit_channel.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 3db0f95e..2751f5b7 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 = <<>> }) ->