diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-11 23:00:54 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-11 23:00:54 +0100 |
| commit | 7d441b1b74773bcb5277942f272faf0f33799221 (patch) | |
| tree | 88c7569ea33ec1c3e7a01b7fd18349b7bfb55e59 /src | |
| parent | 81a3e53881e6af0bd196449cb9a562b38690bb3a (diff) | |
| download | rabbitmq-server-git-7d441b1b74773bcb5277942f272faf0f33799221.tar.gz | |
rename
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_binding.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 8b041fde5b..517434c0a0 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -415,14 +415,14 @@ boolean_or(_True, Any, Any) -> Any. new_deletions() -> dict:new(). add_deletion(XName, Entry, Deletions) -> - dict:update(XName, fun (Entry1) -> combine_entries(Entry1, Entry) end, + dict:update(XName, fun (Entry1) -> merge_entry(Entry1, Entry) end, Entry, Deletions). combine_deletions(Deletions1, Deletions2) -> - dict:merge(fun (_XName, E1, E2) -> combine_entries(E1, E2) end, + dict:merge(fun (_XName, Entry1, Entry2) -> merge_entry(Entry1, Entry2) end, Deletions1, Deletions2). -combine_entries({X1, Deleted1, Bindings1}, {X2, Deleted2, Bindings2}) -> +merge_entry({X1, Deleted1, Bindings1}, {X2, Deleted2, Bindings2}) -> {anything_but(undefined, X1, X2), boolean_or(deleted, Deleted1, Deleted2), [Bindings1 | Bindings2]}. |