summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-12 12:05:56 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-12 12:05:56 +0100
commit703a4168d0f612544f657d0f51bdd8710f5dca1b (patch)
tree6110d844dae5c2b667d6c1fadee1860ae5364769
parent2a30a233aeca8fb95a3312ce9c950d1749081144 (diff)
downloadrabbitmq-server-git-703a4168d0f612544f657d0f51bdd8710f5dca1b.tar.gz
Fix the refactoring which broke bpqueue
-rw-r--r--src/bpqueue.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bpqueue.erl b/src/bpqueue.erl
index 4e9cdb3153..7acc969754 100644
--- a/src/bpqueue.erl
+++ b/src/bpqueue.erl
@@ -278,13 +278,13 @@ map_fold_filter2(Funs = {Out, In, InQ, _Join}, Fun, OrigPrefix, Prefix, Init,
{Init, InQ(OrigPrefix, InnerQ,
InQ(Prefix, InnerQNew, QNew)), false};
{Prefix1, Value1, Init1} ->
- {QNew1, InnerQNew1} =
+ {Prefix2, QNew1, InnerQNew1} =
case Prefix1 =:= Prefix of
- true -> {QNew, In(Value1, InnerQNew)};
- false -> {InQ(Prefix, InnerQNew, QNew),
+ true -> {Prefix, QNew, In(Value1, InnerQNew)};
+ false -> {Prefix1, InQ(Prefix, InnerQNew, QNew),
In(Value1, queue:new())}
end,
- map_fold_filter2(Funs, Fun, OrigPrefix, Prefix, Init1,
+ map_fold_filter2(Funs, Fun, OrigPrefix, Prefix2, Init1,
InnerQ1, QNew1, InnerQNew1)
end
end.