diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-03-04 19:52:34 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-03-04 19:52:34 +0000 |
| commit | 78b753aaf006c397c113b810ef8195a6fc1f927b (patch) | |
| tree | 89ac175abc91e6048878bcddf469c738546db26a /src/rabbit_basic.erl | |
| parent | 1076e2220865be678888d3ec1fd2799bdb55da60 (diff) | |
| parent | e80b3162f252dcda613583ef2e6b271b0c5c4deb (diff) | |
| download | rabbitmq-server-78b753aaf006c397c113b810ef8195a6fc1f927b.tar.gz | |
merge default into bug23914
Diffstat (limited to 'src/rabbit_basic.erl')
| -rw-r--r-- | src/rabbit_basic.erl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index 43230f30..3cf73e80 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -44,7 +44,7 @@ -spec(message/3 :: (rabbit_exchange:name(), rabbit_router:routing_key(), rabbit_types:decoded_content()) -> - rabbit_types:ok_or_error2(rabbit_types:message(), any())). + rabbit_types:ok_or_error2(rabbit_types:message(), any())). -spec(properties/1 :: (properties_input()) -> rabbit_framing:amqp_property_record()). -spec(publish/4 :: @@ -107,9 +107,9 @@ strip_header(#content{properties = Props = #'P_basic'{headers = Headers}} false -> DecodedContent; {value, Found} -> Headers0 = lists:delete(Found, Headers), rabbit_binary_generator:clear_encoded_content( - DecodedContent#content{ - properties = Props#'P_basic'{ - headers = Headers0}}) + DecodedContent#content{ + properties = Props#'P_basic'{ + headers = Headers0}}) end. message(ExchangeName, RoutingKey, @@ -175,15 +175,15 @@ is_message_persistent(#content{properties = #'P_basic'{ Other -> throw({error, {delivery_mode_unknown, Other}}) end. -% Extract CC routes from headers +%% Extract CC routes from headers header_routes(undefined) -> []; header_routes(HeadersTable) -> lists:append( - [case rabbit_misc:table_lookup(HeadersTable, HeaderKey) of - {array, Routes} -> [Route || {longstr, Route} <- Routes]; - undefined -> []; - {Type, _Val} -> throw({error, {unacceptable_type_in_header, - Type, - binary_to_list(HeaderKey)}}) - end || HeaderKey <- ?ROUTING_HEADERS]). + [case rabbit_misc:table_lookup(HeadersTable, HeaderKey) of + {array, Routes} -> [Route || {longstr, Route} <- Routes]; + undefined -> []; + {Type, _Val} -> throw({error, {unacceptable_type_in_header, + Type, + binary_to_list(HeaderKey)}}) + end || HeaderKey <- ?ROUTING_HEADERS]). |