Merge bug25868 (again)

1 files changed, 4 insertions, 5 deletions

diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index b1d0e2759e..60e026a468 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -1077,11 +1077,10 @@ i(state, #v1{connection_state = ConnectionState,
                                           last_blocked_by = WasBlockedBy,
                                           last_blocked_at = T}}) ->
     Recently = T =/= never andalso timer:now_diff(erlang:now(), T) < 5000000,
-    case {credit_flow:blocked() andalso Alarms =:= [],
-          WasBlockedBy, Recently} of
-        {true,  _,    _}    -> flow;
-        {false, flow, true} -> flow;
-        {_,     _,    _}    -> ConnectionState
+    case {credit_flow:blocked(), WasBlockedBy, Alarms, Recently} of
+        {true, _,    [], _}    -> flow;
+        {_,    flow, [], true} -> flow;
+        {_,    _,    _,  _}    -> ConnectionState
     end;
 i(Item,               #v1{connection = Conn}) -> ic(Item, Conn).