diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-18 12:31:41 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-18 12:31:41 +0000 |
| commit | 36a9e21a8c6a8bf8c6b5aa5229ac1a900acf641f (patch) | |
| tree | 4a127f2dcf65e79cf60e5a84af75fcd2d38ce167 /src | |
| parent | 78b440c0d9c5411afab5a0b975eab7970bc4f3d7 (diff) | |
| parent | be1b799e745f4404459953084451e72d35beb2c2 (diff) | |
| download | rabbitmq-server-git-36a9e21a8c6a8bf8c6b5aa5229ac1a900acf641f.tar.gz | |
merge from default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 35e37df61e..3b385020ef 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1441,8 +1441,8 @@ msgs_written_to_disk(QPid, GuidSet, written) -> msgs_confirmed(gb_sets:intersection(GuidSet, MIOD), State #vqstate { msgs_on_disk = - gb_sets:intersection( - gb_sets:union(MOD, GuidSet), UC) }) + gb_sets:union( + MOD, gb_sets:intersection(UC, GuidSet)) }) end). msg_indices_written_to_disk(QPid, GuidSet) -> @@ -1453,8 +1453,8 @@ msg_indices_written_to_disk(QPid, GuidSet) -> msgs_confirmed(gb_sets:intersection(GuidSet, MOD), State #vqstate { msg_indices_on_disk = - gb_sets:intersection( - gb_sets:union(MIOD, GuidSet), UC) }) + gb_sets:union( + MIOD, gb_sets:intersection(UC, GuidSet)) }) end). %%---------------------------------------------------------------------------- |