From 225dc7d4c20f9a5fad9c4c9e90fd3ced828930cb Mon Sep 17 00:00:00 2001
From: Matthew Sackman <matthew@rabbitmq.com>
Date: Thu, 21 Oct 2010 17:59:59 +0100
Subject: Simplify conditional and use the right state

---
 src/rabbit_variable_queue.erl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index cbc71bcc..365d668f 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -1297,9 +1297,8 @@ maybe_deltas_to_betas(State = #vqstate {
                         delta                = Delta,
                         q3                   = Q3,
                         index_state          = IndexState,
-                        target_ram_msg_count = TargetRamMsgCount,
                         transient_threshold  = TransientThreshold }) ->
-    case bpqueue:is_empty(Q3) orelse (TargetRamMsgCount /= 0) of
+    case bpqueue:is_empty(Q3) of
         false ->
             State;
         true ->
@@ -1319,7 +1318,7 @@ maybe_deltas_to_betas(State = #vqstate {
                     %% we ignored every message in the segment due to
                     %% it being transient and below the threshold
                     maybe_deltas_to_betas(
-                      State #vqstate {
+                      State1 #vqstate {
                         delta = Delta #delta { start_seq_id = DeltaSeqId1 }});
                 Q3aLen ->
                     Q3b = bpqueue:join(Q3, Q3a),
-- 
cgit v1.2.1