diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-25 11:59:18 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-25 11:59:18 +0100 |
| commit | a6055b7173f25ef59bb188c6d7f96f0bdc27fd81 (patch) | |
| tree | df3ab47539cd37ae39abaf221d226714608b5817 /src | |
| parent | 00e61d46b64953e503e84a37a144ed81a743d302 (diff) | |
| download | rabbitmq-server-git-a6055b7173f25ef59bb188c6d7f96f0bdc27fd81.tar.gz | |
A cosmetic in vq, and a fix in tests for a bug which was causing the persister tests not to run
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_tests.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 4e89382433..81b633fe31 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -997,12 +997,12 @@ extra_arg_hook(Hookname, Handler, Args, Extra1, Extra2) -> handle_hook(Hookname, Handler, {Args, Extra1, Extra2}). test_backing_queue() -> - case application:get_env(backing_queue_module) of + case application:get_env(rabbit, backing_queue_module) of {ok, rabbit_variable_queue} -> passed = test_msg_store(), passed = test_queue_index(), passed = test_variable_queue(); - _ -> + Other -> passed end. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 95c35759f1..6ac92dc1e1 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1377,9 +1377,9 @@ maybe_deltas_to_betas( maybe_deltas_to_betas( State #vqstate { delta = Delta #delta { start_seq_id = Delta1SeqId }}); - _ -> + Q3aLen -> Q3b = bpqueue:join(Q3, Q3a), - case DeltaCount - bpqueue:len(Q3a) of + case DeltaCount - Q3aLen of 0 -> %% delta is now empty, but it wasn't %% before, so can now join q2 onto q3 |