diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2012-07-16 14:11:35 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-07-16 14:11:35 +0100 |
commit | 6c6b7640d096806bdfc940b6631e15367b17c75a (patch) | |
tree | 26e4919a5c3d0aa67bdd1c2b06e736a0b6ffb21c | |
parent | 65c605d2fb4c1856ff6c4b1223bc8f8226450411 (diff) | |
download | rabbitmq-server-6c6b7640d096806bdfc940b6631e15367b17c75a.tar.gz |
simplifying refactorbug25056
-rw-r--r-- | src/rabbit_reader.erl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index cacca151..447fed74 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -617,15 +617,13 @@ handle_input(frame_header, <<Type:8,Channel:16,PayloadSize:32>>, State) -> switch_callback(State, {frame_payload, Type, Channel, PayloadSize}, PayloadSize + 1)); -handle_input({frame_payload, Type, Channel, PayloadSize}, PayloadAndMarker, - State) -> - case PayloadAndMarker of - <<Payload:PayloadSize/binary, ?FRAME_END>> -> - switch_callback(handle_frame(Type, Channel, Payload, State), - frame_header, 7); - <<Payload:PayloadSize/binary, EndMarker>> -> - frame_error({invalid_frame_end_marker, EndMarker}, - Type, Channel, Payload, State) +handle_input({frame_payload, Type, Channel, PayloadSize}, Data, State) -> + <<Payload:PayloadSize/binary, EndMarker>> = Data, + case EndMarker of + ?FRAME_END -> State1 = handle_frame(Type, Channel, Payload, State), + switch_callback(State1, frame_header, 7); + _ -> frame_error({invalid_frame_end_marker, EndMarker}, + Type, Channel, Payload, State) end; %% The two rules pertaining to version negotiation: |