summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-02-22 12:40:05 +0000
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-02-22 12:40:05 +0000
commita878fa0bb595705d82b6805498cd40e594e38fa4 (patch)
tree489d09178fdc701a85ce25f5043b22885b542c1a
parent9c96f4dd395aa659bb46b9d97c9e7753ce580cd9 (diff)
downloadrabbitmq-server-a878fa0bb595705d82b6805498cd40e594e38fa4.tar.gz
Removed reduce_memory_use test before actual reduce_memory_use in timeout/1.
-rw-r--r--src/rabbit_variable_queue.erl9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index ea18ef2a..a4d18b50 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -743,14 +743,7 @@ needs_timeout(State = #vqstate { index_state = IndexState }) ->
timeout(State = #vqstate { index_state = IndexState }) ->
IndexState1 = rabbit_queue_index:sync(IndexState),
State1 = State #vqstate { index_state = IndexState1 },
- a(case reduce_memory_use(
- fun (_Quota, State2) -> {0, State2} end,
- fun (_Quota, State2) -> State2 end,
- fun (_Quota, State2) -> {0, State2} end,
- State) of
- {true, _State} -> reduce_memory_use(State1);
- {false, _State} -> State1
- end).
+ reduce_memory_use(State1).
handle_pre_hibernate(State = #vqstate { index_state = IndexState }) ->
State #vqstate { index_state = rabbit_queue_index:flush(IndexState) }.