diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-06 13:47:28 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-06 13:47:28 +0000 |
| commit | df61129d41af4c90645e7f3153060bb25feb2f5c (patch) | |
| tree | ef36a76fa8a881119a2e1872079a0c1080bf37ad /src | |
| parent | 8e2b7f2c2e90fdd294b0863501b1c4eedfe58946 (diff) | |
| parent | 71435519eea1139d363ed0b403eb3346e4f779ac (diff) | |
| download | rabbitmq-server-git-df61129d41af4c90645e7f3153060bb25feb2f5c.tar.gz | |
Merge bug25928 again
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_writer.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 32b52e6e79..f50d8999f7 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -808,7 +808,7 @@ handle_method0(MethodName, FieldsBin, try handle_method0(Protocol:decode_method_fields(MethodName, FieldsBin), State) - catch throw:{writer_inet_error, closed} -> + catch throw:{inet_error, closed} -> maybe_emit_stats(State), throw(connection_closed_abruptly); exit:#amqp_error{method = none} = Reason -> diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl index 92d48e633f..34dd3d3b35 100644 --- a/src/rabbit_writer.erl +++ b/src/rabbit_writer.erl @@ -272,7 +272,7 @@ assemble_frames(Channel, MethodRecord, Content, FrameMax, Protocol) -> [MethodFrame | ContentFrames]. tcp_send(Sock, Data) -> - rabbit_misc:throw_on_error(writer_inet_error, + rabbit_misc:throw_on_error(inet_error, fun () -> rabbit_net:send(Sock, Data) end). internal_send_command(Sock, Channel, MethodRecord, Protocol) -> |