diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-10-29 14:22:38 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-10-29 14:22:38 +0000 |
| commit | 3dbe2cede1f87e420cce098595a779f366cd043f (patch) | |
| tree | 93f272561dbb1d272652b7d5ee950a5e1089f441 | |
| parent | 412d94bcdd6733f17849b08a467db1fdb56480d0 (diff) | |
| download | rabbitmq-server-3dbe2cede1f87e420cce098595a779f366cd043f.tar.gz | |
refactor
| -rw-r--r-- | src/rabbit_basic.erl | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl index 7cf3515e..c3e1ac99 100644 --- a/src/rabbit_basic.erl +++ b/src/rabbit_basic.erl @@ -197,30 +197,30 @@ set_invalid_header(Name, {_, _}=Value, Headers) when is_list(Headers) -> case rabbit_misc:table_lookup(Headers, ?INVALID_HEADERS_KEY) of undefined -> Invalid = [{Name, array, [Value]}], - rabbit_misc:set_table_value(Headers, ?INVALID_HEADERS_KEY, - table, Invalid); + set_invalid(Headers, Invalid); {table, InvalidEntries} -> case rabbit_misc:table_lookup(InvalidEntries, Name) of undefined -> - rabbit_misc:set_table_value( - Headers, ?INVALID_HEADERS_KEY, table, - rabbit_misc:set_table_value(InvalidEntries, - Name, array, [Value])); + set_invalid(Headers, InvalidEntries, Name, [Value]); {array, Prior} -> - rabbit_misc:set_table_value( - Headers, ?INVALID_HEADERS_KEY, table, - rabbit_misc:set_table_value(InvalidEntries, - Name, array, [Value | Prior])) + set_invalid(Headers, InvalidEntries, Name, [Value | Prior]) end; Other -> %% somehow the x-invalid-headers header is corrupt - set_invalid_header( - Name, Value, - rabbit_misc:set_table_value( - Headers, ?INVALID_HEADERS_KEY, - table, [{?INVALID_HEADERS_KEY, array, [Other]}])) + Invalid = [{?INVALID_HEADERS_KEY, array, [Other]}], + set_invalid_header(Name, Value, set_invalid(Headers, Invalid)) end. +set_invalid(Headers, Invalid) -> + rabbit_misc:set_table_value(Headers, ?INVALID_HEADERS_KEY, + table, Invalid). + +set_invalid(Headers, InvalidEntries, Name, Values) -> + rabbit_misc:set_table_value( + Headers, ?INVALID_HEADERS_KEY, table, + rabbit_misc:set_table_value(InvalidEntries, + Name, array, Values)). + extract_headers(Content) -> #content{properties = #'P_basic'{headers = Headers}} = rabbit_binary_parser:ensure_content_decoded(Content), |