diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-06-17 11:44:25 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-06-17 11:44:25 +0200 |
| commit | f0931b7dcca40e366e8272dfa403cc52493ec9b3 (patch) | |
| tree | de68ca8893260eb5262bd7e94c35d3ba373b806e /src | |
| parent | 1d152ce87d127e20a791e0879ea9ec793af6fddc (diff) | |
| parent | 252ea74d444af3efdb9ef59c129b1f9293999e53 (diff) | |
| download | rabbitmq-server-git-f0931b7dcca40e366e8272dfa403cc52493ec9b3.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/gen_server2.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl index d2f96b5250..fd0e6553b5 100644 --- a/src/gen_server2.erl +++ b/src/gen_server2.erl @@ -576,10 +576,11 @@ init_it(Starter, Parent, Name0, Mod, Args, Options) -> {ok, State, Timeout, Backoff = {backoff, _, _, _}, Mod1} -> Backoff1 = extend_backoff(Backoff), proc_lib:init_ack(Starter, {ok, self()}), - loop(GS2State #gs2_state { mod = Mod1, - state = State, - time = Timeout, - timeout_state = Backoff1 }); + loop(find_prioritisers( + GS2State #gs2_state { mod = Mod1, + state = State, + time = Timeout, + timeout_state = Backoff1 })); {stop, Reason} -> %% For consistency, we must make sure that the %% registered name (if any) is unregistered before |