TODO-- yes it could be faster.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/priority_queue.erl b/src/priority_queue.erl
index 3c46c4cee2..572bca95ee 100644
--- a/src/priority_queue.erl
+++ b/src/priority_queue.erl
@@ -41,7 +41,7 @@
 -module(priority_queue).
 
 -export([new/0, is_queue/1, is_empty/1, len/1, to_list/1, from_list/1,
-         in/2, in/3, out/1, join/2, filter/2, fold/3]).
+         in/2, in/3, out/1, join/2, filter/2, fold/3, highest/1]).
 
 %%----------------------------------------------------------------------------
 
@@ -66,6 +66,7 @@
 -spec(join/2 :: (pqueue(), pqueue()) -> pqueue()).
 -spec(filter/2 :: (fun ((any()) -> boolean()), pqueue()) -> pqueue()).
 -spec(fold/3 :: (fun ((any(), any()) -> any()), any(), pqueue()) -> any()).
+-spec(highest/1 :: (pqueue()) -> priority()).
 
 -endif.
 
@@ -211,6 +212,9 @@ fold(Fun, Init, Q) -> case out_p(Q) of
                           {{value, V, P}, Q1} -> fold(Fun, Fun(V, P, Init), Q1)
                       end.
 
+highest({queue, _, _, _})       -> 0;
+highest({pqueue, [{P, _} | _]}) -> maybe_negate_priority(P).
+
 r2f([],      0) -> {queue, [], [], 0};
 r2f([_] = R, 1) -> {queue, [], R, 1};
 r2f([X,Y],   2) -> {queue, [X], [Y], 2};
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index e3eeded918..60b56aeb07 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -550,10 +550,7 @@ notify_federation(#q{q                   = Q,
         false -> rabbit_federation_queue:stop(Q)
     end.
 
-active_unfederated(Cs) ->
-    %% TODO could this be faster?
-    lists:any(fun ({Priority, _Consumer}) -> Priority < 0 end,
-              priority_queue:to_list(Cs)).
+active_unfederated(Cs) -> priority_queue:highest(Cs) >= 0.
 
 consumer_priority({_ChPid, #consumer{args = Args}}) ->
     case rabbit_misc:table_lookup(Args, <<"x-priority">>) of