diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-20 16:05:52 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-20 16:05:52 +0100 |
| commit | 8b267b22d9f2551875adc7763bc6a784a2312fe9 (patch) | |
| tree | 882b8bfcf2e1615fc9f045355740ac42989323a0 /src | |
| parent | e8dfee98ae3033453a4bb83baa464f1e822fdded (diff) | |
| parent | 3e06c88ea1ffe6c7ccaf905c0c0173e224ed2925 (diff) | |
| download | rabbitmq-server-git-8b267b22d9f2551875adc7763bc6a784a2312fe9.tar.gz | |
merge heads
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e98ca9be33..530955c201 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -224,6 +224,13 @@ prepare() -> start() -> try + %% prepare/1 ends up looking at the rabbit app's env, so it + %% needs to be loaded, but during the tests, it may end up + %% getting loaded twice, so guard against that + case application:load(rabbit) of + ok -> ok; + {error, {already_loaded, rabbit}} -> ok + end, ok = prepare(), ok = rabbit_misc:start_applications(application_load_order()) after |