summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-07-21 14:38:45 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-07-21 14:38:45 +0100
commit036b6f14a125f5355f300d9068e261f3c96a0572 (patch)
treeff5f269b2dc1542ecb17313672dbefe4211ae346
parent169172e2ea254db5e1f609db568b31f41296b517 (diff)
downloadrabbitmq-server-git-036b6f14a125f5355f300d9068e261f3c96a0572.tar.gz
Whoops - revert to avoid deadlock with supervisor trying to call itself during child creation
-rw-r--r--src/rabbit_framing_channel.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_framing_channel.erl b/src/rabbit_framing_channel.erl
index b1e42e598c..2e9f02a3e0 100644
--- a/src/rabbit_framing_channel.erl
+++ b/src/rabbit_framing_channel.erl
@@ -40,7 +40,9 @@
%%--------------------------------------------------------------------
start_link() ->
- start_link(rabbit_channel_sup:channel(self())).
+ Parent = self(),
+ {ok, proc_lib:spawn_link(
+ fun () -> mainloop(rabbit_channel_sup:channel(Parent)) end)}.
start_link(ChannelPid) ->
{ok, proc_lib:spawn_link(fun() -> mainloop(ChannelPid) end)}.