diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-08-09 12:11:09 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-08-09 12:11:09 +0100 |
| commit | abbec139fd84a9047f87dc2e45a46fbe31cc61a2 (patch) | |
| tree | 54d0d30ab0a16760518bc77af9fa5872f189e08f /src | |
| parent | 601fccb19f8ca8b16a8acdaa3fd9ec384054d117 (diff) | |
| parent | a667798ec6299fd89fc3ebc6fac8b354b31f68b1 (diff) | |
| download | rabbitmq-server-git-abbec139fd84a9047f87dc2e45a46fbe31cc61a2.tar.gz | |
Merging bug 23094 into bug 15930
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 5c0dee7320..ce3d879cf4 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -197,7 +197,7 @@ init(Parent, ChannelSupSupPid, Collector) -> end. system_continue(Parent, Deb, State) -> - ?MODULE:mainloop(Deb, State = #v1{parent = Parent}). + ?MODULE:mainloop(Deb, State#v1{parent = Parent}). system_terminate(Reason, _Parent, _Deb, _State) -> exit(Reason). @@ -333,8 +333,7 @@ mainloop(Deb, State = #v1{parent = Parent, sock= Sock, recv_ref = Ref}) -> {State1, Callback1, Length1} = handle_input(State#v1.callback, Data, State#v1{recv_ref = none}), - mainloop(Deb, - switch_callback(State1, Callback1, Length1)); + mainloop(Deb, switch_callback(State1, Callback1, Length1)); {inet_async, Sock, Ref, {error, closed}} -> if State#v1.connection_state =:= closed -> State; |