Merged default into 18557

This commit is contained in:
Ben Hood 2008-11-20 14:31:54 +00:00
commit 657c359e24
2 changed files with 11 additions and 3 deletions

View File

@ -11,7 +11,7 @@ URL: http://www.rabbitmq.com/
Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd.
%if 0%{?debian} %if 0%{?debian}
%else %else
BuildRequires: python, python-json BuildRequires: erlang, python-json
%endif %endif
Requires: erlang, logrotate Requires: erlang, logrotate
Packager: Hubert Plociniczak <hubert@lshift.net> Packager: Hubert Plociniczak <hubert@lshift.net>

View File

@ -268,9 +268,17 @@ exchanges_for_queue(QueueName) ->
has_bindings(ExchangeName) -> has_bindings(ExchangeName) ->
MatchHead = #route{binding = #binding{exchange_name = ExchangeName, MatchHead = #route{binding = #binding{exchange_name = ExchangeName,
queue_name = '$1',
_ = '_'}}, _ = '_'}},
continue(mnesia:select(route, [{MatchHead, [], ['$1']}], 1, read)). try
continue(mnesia:select(route, [{MatchHead, [], ['$_']}], 1, read))
catch exit:{aborted, {badarg, _}} ->
%% work around OTP-7025, which was fixed in R12B-1, by
%% falling back on a less efficient method
case mnesia:match_object(MatchHead) of
[] -> false;
[_|_] -> true
end
end.
continue('$end_of_table') -> false; continue('$end_of_table') -> false;
continue({[_|_], _}) -> true; continue({[_|_], _}) -> true;