diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-12 16:19:40 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-12 16:19:40 +0000 |
| commit | baff10c547175e6041a3514ec02e70ebb2d2858c (patch) | |
| tree | 199e54b91b4e38e045564208920be59f23ceded5 | |
| parent | 13bde6759b7e91f322ed7a453f424a7e03ddb4fe (diff) | |
| download | rabbitmq-server-bug23643.tar.gz | |
Eliminate unnecessary put/2, and cosmeticbug23643
| -rw-r--r-- | src/rabbit_reader.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 947dde6e..576c2f36 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -960,11 +960,10 @@ send_to_new_channel(Channel, AnalyzedFrame, State) -> ChanSupSup, {Protocol, Sock, Channel, FrameMax, self(), User, VHost, Collector}), erlang:monitor(process, ChPid), - put({channel, Channel}, {ChPid, AState}), - put({ch_pid, ChPid}, Channel), NewAState = process_channel_frame(AnalyzedFrame, self(), Channel, ChPid, AState), put({channel, Channel}, {ChPid, NewAState}), + put({ch_pid, ChPid}, Channel), State. process_channel_frame(Frame, ErrPid, Channel, ChPid, AState) -> @@ -975,9 +974,9 @@ process_channel_frame(Frame, ErrPid, Channel, ChPid, AState) -> {ok, Method, Content, NewAState} -> rabbit_channel:do(ChPid, Method, Content), NewAState; - {error, Reason} -> ErrPid ! {channel_exit, Channel, - Reason}, - AState + {error, Reason} -> ErrPid ! {channel_exit, Channel, + Reason}, + AState end. log_channel_error(ConnectionState, Channel, Reason) -> |