diff options
| author | Vlad Ionescu <vlad@lshift.net> | 2010-09-27 19:44:44 +0100 |
|---|---|---|
| committer | Vlad Ionescu <vlad@lshift.net> | 2010-09-27 19:44:44 +0100 |
| commit | 21a74891c40dee991f0cd0084f7cd7e49e331b60 (patch) | |
| tree | fe89aa06daeb1c30ecfa22da7ba2a1fa203c619e | |
| parent | 5475664cd154c66cff21177bd962b3cc61af8fd9 (diff) | |
| download | rabbitmq-server-21a74891c40dee991f0cd0084f7cd7e49e331b60.tar.gz | |
using rabbit_guid; cosmetic
| -rw-r--r-- | src/rabbit_exchange_type_topic.erl | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/rabbit_exchange_type_topic.erl b/src/rabbit_exchange_type_topic.erl index e2114b5d..8e6918d0 100644 --- a/src/rabbit_exchange_type_topic.erl +++ b/src/rabbit_exchange_type_topic.erl @@ -133,8 +133,7 @@ trie_match(X, Node, [W | RestW] = Words) -> trie_match_skip_any(X, Node, []) -> trie_match(X, Node, []); trie_match_skip_any(X, Node, [_ | RestW] = Words) -> - trie_match(X, Node, Words) ++ - trie_match_skip_any(X, Node, RestW). + trie_match(X, Node, Words) ++ trie_match_skip_any(X, Node, RestW). follow_down(X, Words) -> follow_down(X, root, Words). @@ -148,15 +147,13 @@ follow_down(X, CurNode, [W | RestW]) -> follow_down_create(X, Words) -> case follow_down(X, Words) of - {ok, FinalNode} -> - FinalNode; - {error, Node, RestW} -> - lists:foldl( - fun(W, CurNode) -> - NewNode = new_node(), - trie_add_edge(X, CurNode, NewNode, W), - NewNode - end, Node, RestW) + {ok, FinalNode} -> FinalNode; + {error, Node, RestW} -> lists:foldl( + fun(W, CurNode) -> + NewNode = new_node(), + trie_add_edge(X, CurNode, NewNode, W), + NewNode + end, Node, RestW) end. follow_down_get_path(X, Words) -> @@ -271,7 +268,7 @@ trie_remove_all_bindings(X) -> qlc:e(Query)). new_node() -> - now(). % UUID + rabbit_guid:guid(). split_topic_key(Key) -> string:tokens(binary_to_list(Key), "."). |