diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-01 14:29:00 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-09-01 14:29:00 +0100 |
| commit | b25a80bfdaebbcc17d2fbf9c3eb9caaa6b84acff (patch) | |
| tree | 71d99de582a854c65779d1d8bc2f12eec2a883ad | |
| parent | 9bd5378eb6e56143f558254483be2307ded441b1 (diff) | |
| parent | 1c0694b6be30c0970cde799fe5d5548e1e449d2e (diff) | |
| download | rabbitmq-server-b25a80bfdaebbcc17d2fbf9c3eb9caaa6b84acff.tar.gz | |
merge bug23215 into default
| -rw-r--r-- | src/rabbit_writer.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index fd5b5ba5..fc1d96cf 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -127,13 +127,13 @@ handle_message({send_command, MethodRecord, Content}, ok = internal_send_command_async(Sock, Channel, MethodRecord, Content, FrameMax, Protocol), State; -handle_message({send_command_sync, From, MethodRecord}, +handle_message({'$gen_call', From, {send_command_sync, MethodRecord}}, State = #wstate{sock = Sock, channel = Channel, protocol = Protocol}) -> ok = internal_send_command_async(Sock, Channel, MethodRecord, Protocol), gen_server:reply(From, ok), State; -handle_message({send_command_sync, From, {MethodRecord, Content}}, +handle_message({'$gen_call', From, {send_command_sync, MethodRecord, Content}}, State = #wstate{sock = Sock, channel = Channel, frame_max = FrameMax, @@ -169,10 +169,10 @@ send_command(W, MethodRecord, Content) -> ok. send_command_sync(W, MethodRecord) -> - call(W, send_command_sync, MethodRecord). + call(W, {send_command_sync, MethodRecord}). send_command_sync(W, MethodRecord, Content) -> - call(W, send_command_sync, {MethodRecord, Content}). + call(W, {send_command_sync, MethodRecord, Content}). send_command_and_notify(W, Q, ChPid, MethodRecord, Content) -> W ! {send_command_and_notify, Q, ChPid, MethodRecord, Content}, @@ -180,8 +180,8 @@ send_command_and_notify(W, Q, ChPid, MethodRecord, Content) -> %--------------------------------------------------------------------------- -call(Pid, Label, Msg) -> - {ok, Res} = gen:call(Pid, Label, Msg, infinity), +call(Pid, Msg) -> + {ok, Res} = gen:call(Pid, '$gen_call', Msg, infinity), Res. %--------------------------------------------------------------------------- |