diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-05-13 12:38:59 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-05-13 12:38:59 +0100 |
| commit | 9772b7ebd0723521eaa3f4fb442d5e77375efea3 (patch) | |
| tree | da027d970e44782dc0379ada8ead38e3f8b37fc7 | |
| parent | 31dbffcc0d96cbe345efb8876e7348befad7a665 (diff) | |
| download | rabbitmq-server-git-9772b7ebd0723521eaa3f4fb442d5e77375efea3.tar.gz | |
Reverse the order so that we stop and then unlink+capture_exit. We don't think this should make any difference, but it's a little neater
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_queue_index.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 508bc60d4b..0f8f425656 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1335,8 +1335,8 @@ build_index(Gatherer, Left, [], sum_file_size = SumFileSize }) -> case gatherer:out(Gatherer) of empty -> - ok = rabbit_misc:unlink_and_capture_exit(Gatherer), ok = gatherer:stop(Gatherer), + ok = rabbit_misc:unlink_and_capture_exit(Gatherer), ok = index_delete_by_file(undefined, State), Offset = case ets:lookup(FileSummaryEts, Left) of [] -> 0; diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 0cb44e0a71..a4e3689168 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -469,8 +469,8 @@ queue_index_walker({start, DurableQueues}) when is_list(DurableQueues) -> queue_index_walker({next, Gatherer}) when is_pid(Gatherer) -> case gatherer:out(Gatherer) of empty -> - ok = rabbit_misc:unlink_and_capture_exit(Gatherer), ok = gatherer:stop(Gatherer), + ok = rabbit_misc:unlink_and_capture_exit(Gatherer), finished; {value, {Guid, Count}} -> {Guid, Count, {next, Gatherer}} |