summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-12-20 18:45:30 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-12-20 18:45:30 +0000
commit1ec2ac8b0ffb712f6b1e14ac0366a6dd869dc1d3 (patch)
treebc6dab9003ea669f2b2ebf21b86987d09e4938a2
parent308a2b5f5603b20906de2bec0d7d80ff99073e86 (diff)
downloadrabbitmq-server-git-1ec2ac8b0ffb712f6b1e14ac0366a6dd869dc1d3.tar.gz
Pass queues and recovery terms to fold
-rw-r--r--src/rabbit_variable_queue.erl4
-rw-r--r--test/channel_operation_timeout_test_queue.erl4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 43e0d30a4e..c0a2adbc67 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -482,7 +482,9 @@ start(DurableQueues) ->
end,
{QNames, maps:put(VHost, [Ref|Refs], VhostRefs)}
end
- end),
+ end,
+ {DurableQueues, #{}},
+ AllTerms),
start_msg_store(VhostRefs, StartFunState),
{ok, AllTerms}.
diff --git a/test/channel_operation_timeout_test_queue.erl b/test/channel_operation_timeout_test_queue.erl
index 5a41eb86bf..124fda47b1 100644
--- a/test/channel_operation_timeout_test_queue.erl
+++ b/test/channel_operation_timeout_test_queue.erl
@@ -232,7 +232,9 @@ start(DurableQueues) ->
end,
{QNames, maps:put(VHost, [Ref|Refs], VhostRefs)}
end
- end),
+ end,
+ {DurableQueues, #{}},
+ AllTerms),
start_msg_store(VhostRefs, StartFunState),
{ok, AllTerms}.