diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2013-12-05 16:58:05 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2013-12-05 16:58:05 +0400 |
| commit | bc7493846ec641166d5f690bb672eddb168dbbd5 (patch) | |
| tree | 037e55f000a5b3ad00372bbfe792cdeb80376805 /src | |
| parent | fbd5e5b95ccc256d86f969cc976f57a8abff7eb1 (diff) | |
| download | rabbitmq-server-git-bc7493846ec641166d5f690bb672eddb168dbbd5.tar.gz | |
Disambiguate return values
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 4cba5dc877..ddacbf2628 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -625,8 +625,8 @@ create_channel(Channel, State) -> Protocol, User, VHost, Capabilities, Collector}), MRef = erlang:monitor(process, ChPid), put({ch_pid, ChPid}, {Channel, MRef}), - put({channel, Channel}, {ChPid, AState}), - {ChPid, AState} + put({channel, Channel}, {ok, ChPid, AState}), + {ok, ChPid, AState} end. channel_cleanup(ChPid) -> @@ -682,18 +682,18 @@ process_frame(Frame, Channel, State) -> case Ch of {error, Error} -> handle_exception(State, Channel, Error); - {ChPid, AState} -> + {ok, ChPid, AState} -> case rabbit_command_assembler:process(Frame, AState) of {ok, NewAState} -> - put(ChKey, {ChPid, NewAState}), + put(ChKey, {ok, ChPid, NewAState}), post_process_frame(Frame, ChPid, State); {ok, Method, NewAState} -> rabbit_channel:do(ChPid, Method), - put(ChKey, {ChPid, NewAState}), + put(ChKey, {ok, ChPid, NewAState}), post_process_frame(Frame, ChPid, State); {ok, Method, Content, NewAState} -> rabbit_channel:do_flow(ChPid, Method, Content), - put(ChKey, {ChPid, NewAState}), + put(ChKey, {ok, ChPid, NewAState}), post_process_frame(Frame, ChPid, control_throttle(State)); {error, Reason} -> handle_exception(State, Channel, Reason) |