summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-04-16 16:29:28 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-04-16 16:29:28 +0100
commit32f7ee005661a138adfe001015d5d6d4b957ee2b (patch)
tree2790ee638759caa9bccf0e251b3e4d5a65e05775 /src
parent84d39b300d7120862f7d8c4ea46c4168f385c8b5 (diff)
downloadrabbitmq-server-git-32f7ee005661a138adfe001015d5d6d4b957ee2b.tar.gz
We can end up hearing about a reason we have already heard about, because rabbit_alarm *both* returns them from register() and immediately calls the MFA during register(). Tests now pass.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index ec497410c1..a272706707 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -327,7 +327,7 @@ handle_other({conserve_resources, Source, Conserve},
State = #v1{throttle = Throttle =
#throttle{conserve_resources = CR}}) ->
CR1 = case Conserve of
- true -> [Source | CR];
+ true -> lists:usort([Source | CR]);
false -> CR -- [Source]
end,
Throttle1 = Throttle#throttle{conserve_resources = CR1},