summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-07-18 11:07:58 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-07-18 11:07:58 +0100
commit3fe9c2e35b9a4e7076f41b51f01aa8a3d9c057e3 (patch)
tree6d21bbd2b0ab832e98c53b6f57eebbddb60faa1d
parentf70300be10c1e4f4aa1ec4848585cfad7575e2c0 (diff)
parentd7d72c8b93c1d257f923471b51efa414a3daef2f (diff)
downloadrabbitmq-server-git-3fe9c2e35b9a4e7076f41b51f01aa8a3d9c057e3.tar.gz
Merge bug24985
-rw-r--r--src/rabbit_reader.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 7524600785..5a1e1815b3 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -313,7 +313,7 @@ handle_other(handshake_timeout, Deb, State)
mainloop(Deb, State);
handle_other(handshake_timeout, _Deb, State) ->
throw({handshake_timeout, State#v1.callback});
-handle_other(timeout, Deb, State = #v1{connection_state = closed}) ->
+handle_other(heartbeat_timeout, Deb, State = #v1{connection_state = closed}) ->
mainloop(Deb, State);
handle_other(heartbeat_timeout, _Deb, #v1{connection_state = S}) ->
throw({heartbeat_timeout, S});