diff options
author | Ben Hood <0x6e6562@gmail.com> | 2008-08-11 18:49:54 +0100 |
---|---|---|
committer | Ben Hood <0x6e6562@gmail.com> | 2008-08-11 18:49:54 +0100 |
commit | 42f44c9764fc188c1bdf7b03fc45221300bac865 (patch) | |
tree | 63c328563a4fbd1831556489d85cd44c0540a95d | |
parent | 096f2f2dd3626498e31b7885517c3c5bb50a22b8 (diff) | |
download | rabbitmq-server-42f44c9764fc188c1bdf7b03fc45221300bac865.tar.gz |
Incorporated QA comments
-rw-r--r-- | src/rabbit_channel.erl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index a116c33d..15e2879b 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -93,7 +93,7 @@ init(ProxyPid, [ReaderPid, WriterPid, Username, VHost]) -> unacked_message_q = queue:new(), username = Username, virtual_host = VHost, - most_recently_declared_queue = none, + most_recently_declared_queue = <<>>, consumer_mapping = dict:new()}. handle_message({method, Method, Content}, State) -> @@ -153,7 +153,8 @@ ok_msg(true, _Msg) -> undefined; ok_msg(false, Msg) -> Msg. return_queue_declare_ok(State, NoWait, Q) -> - NewState = State#ch{most_recently_declared_queue = Q#amqqueue.name}, + NewState = State#ch{most_recently_declared_queue = + (Q#amqqueue.name)#resource.name}, case NoWait of true -> {noreply, NewState}; false -> @@ -161,27 +162,28 @@ return_queue_declare_ok(State, NoWait, Q) -> rabbit_misc:with_exit_handler( fun () -> {ok, Q#amqqueue.name, 0, 0} end, fun () -> rabbit_amqqueue:stat(Q) end), - QueueName = ActualName#resource.name, - Reply = #'queue.declare_ok'{queue = QueueName, + Reply = #'queue.declare_ok'{queue = ActualName#resource.name, message_count = MessageCount, consumer_count = ConsumerCount}, {reply, Reply, NewState} end. -expand_queue_name_shortcut(<<>>, #ch{ most_recently_declared_queue = none }) -> +expand_queue_name_shortcut(<<>>, #ch{ most_recently_declared_queue = <<>> }) -> rabbit_misc:protocol_error( not_allowed, "no previously declared queue", []); -expand_queue_name_shortcut(<<>>, #ch{ most_recently_declared_queue = MRDQ }) -> MRDQ; +expand_queue_name_shortcut(<<>>, #ch{ virtual_host = VHostPath, + most_recently_declared_queue = MRDQ }) -> + rabbit_misc:r(VHostPath, queue, MRDQ); expand_queue_name_shortcut(QueueNameBin, #ch{ virtual_host = VHostPath }) -> rabbit_misc:r(VHostPath, queue, QueueNameBin). expand_routing_key_shortcut(<<>>, <<>>, - #ch{ most_recently_declared_queue = none }) -> + #ch{ most_recently_declared_queue = <<>> }) -> rabbit_misc:protocol_error( not_allowed, "no previously declared queue", []); expand_routing_key_shortcut(<<>>, <<>>, #ch{ most_recently_declared_queue = MRDQ }) -> - MRDQ#resource.name; + MRDQ; expand_routing_key_shortcut(_QueueNameBin, RoutingKey, _State) -> RoutingKey. @@ -529,10 +531,8 @@ handle_method(#'queue.declare'{queue = QueueNameBin, <<>> -> rabbit_misc:binstring_guid("amq.gen"); Other -> check_name('queue', Other) end, - Finish(rabbit_amqqueue:declare(rabbit_misc:r(VHostPath, queue, ActualNameBin), - Durable, - AutoDelete, - Args)); + QueueName = rabbit_misc:r(VHostPath, queue, ActualNameBin), + Finish(rabbit_amqqueue:declare(QueueName, Durable, AutoDelete, Args)); Other -> Other end, return_queue_declare_ok(State, NoWait, Q); |