From 11ab73575f1becfc72d98bb07c69a4d0f92a51c3 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Thu, 12 Dec 2013 16:35:51 +0000 Subject: Simplify --- src/rabbit_reader.erl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 67effab0..2e045b2b 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1046,11 +1046,9 @@ i(state, #v1{connection_state = ConnectionState, throttle = #throttle{last_blocked_by = BlockedBy, last_blocked_at = T}}) -> Recent = T =/= never andalso timer:now_diff(erlang:now(), T) < 5000000, - case {BlockedBy, ConnectionState, Recent} of - {resourse, blocked, _} -> blocked; - {_, blocking, _} -> blocking; - {flow, _, true} -> flow; - {_, _, _} -> ConnectionState + case {BlockedBy, Recent} of + {flow, true} -> flow; + {_, _} -> ConnectionState end; i(Item, #v1{connection = Conn}) -> ic(Item, Conn). -- cgit v1.2.1