summaryrefslogtreecommitdiff
path: root/src/rabbit_channel.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-09-11 16:54:19 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-09-11 16:54:19 +0100
commit7998299ddb26c5c8766a4eb1017c8b1776f7957c (patch)
tree1090b1a0a20e7cd04e6269d186a16b8e253cc25f /src/rabbit_channel.erl
parent75bd64e77ba5aca38859971156404faa49409972 (diff)
parentecfd2b2f60ad2e5802a5d533234ab28b13cc7bd3 (diff)
downloadrabbitmq-server-7998299ddb26c5c8766a4eb1017c8b1776f7957c.tar.gz
Merge in defaultbug25276
Diffstat (limited to 'src/rabbit_channel.erl')
-rw-r--r--src/rabbit_channel.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index d59992cc..dc37959b 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1023,7 +1023,12 @@ handle_method(#'queue.declare'{queue = QueueNameBin,
%% declare. Loop around again.
handle_method(Declare, none, State);
{absent, Q} ->
- rabbit_misc:absent(Q)
+ rabbit_misc:absent(Q);
+ {owner_died, _Q} ->
+ %% Presumably our own days are numbered since the
+ %% connection has died. Pretend the queue exists though,
+ %% just so nothing fails.
+ return_queue_declare_ok(QueueName, NoWait, 0, 0, State)
end;
{error, {absent, Q}} ->
rabbit_misc:absent(Q)