diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-02 13:39:04 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-02 13:39:04 +0100 |
| commit | cdc101ed2e8d9fdf8ddb52cc7c5b75ba1771bde7 (patch) | |
| tree | 227908161e3edad7cb730af4e8823fdf1b8e4916 /src/rabbit_channel.erl | |
| parent | 17514ede33558c260a98869f900091adb2781d1e (diff) | |
| parent | 45e37ef127ec961f1aa194f7369a3cdc1084f2ea (diff) | |
| download | rabbitmq-server-cdc101ed2e8d9fdf8ddb52cc7c5b75ba1771bde7.tar.gz | |
Merge default into bug22889, and remove another hard coded protocol use.
Diffstat (limited to 'src/rabbit_channel.erl')
| -rw-r--r-- | src/rabbit_channel.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index f2a3e071..da91bef8 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -718,7 +718,7 @@ handle_method(#'queue.declare'{queue = QueueNameBin, Q, Durable, AutoDelete, Args, Owner), rabbit_amqqueue:stat(Q) end) of - {ok, QueueName, MessageCount, ConsumerCount} -> + {ok, MessageCount, ConsumerCount} -> return_queue_declare_ok(QueueName, NoWait, MessageCount, ConsumerCount, State); {error, not_found} -> @@ -748,7 +748,7 @@ handle_method(#'queue.declare'{queue = QueueNameBin, reader_pid = ReaderPid}) -> QueueName = rabbit_misc:r(VHostPath, queue, QueueNameBin), check_configure_permitted(QueueName, State), - {{ok, QueueName, MessageCount, ConsumerCount}, #amqqueue{} = Q} = + {{ok, MessageCount, ConsumerCount}, #amqqueue{} = Q} = rabbit_amqqueue:with_or_die( QueueName, fun (Q) -> {rabbit_amqqueue:stat(Q), Q} end), ok = rabbit_amqqueue:check_exclusive_access(Q, ReaderPid), |