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 | 54e0b5f85c133dc164a4c927c42a278aabd7dbfa (patch) | |
| tree | 882b8bfcf2e1615fc9f045355740ac42989323a0 | |
| parent | daa4f4fb8520c2bc5c49cb26cf6bc1b95901aebf (diff) | |
| parent | 386f5874b02712f1e5a943ddf2b73f092efdd5e6 (diff) | |
| download | rabbitmq-server-54e0b5f85c133dc164a4c927c42a278aabd7dbfa.tar.gz | |
merge heads
| -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 e98ca9be..530955c2 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 |