diff options
| author | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-05-14 19:54:53 +1200 |
|---|---|---|
| committer | Tony Garnock-Jones <tonygarnockjones@gmail.com> | 2010-05-14 19:54:53 +1200 |
| commit | 3b0fddfd09bc5a7a040b3e55d948297cfed98e27 (patch) | |
| tree | 6309caa8f25c916927a0448ed9acd997bfa0e50c | |
| parent | a28e2fc79118bb029de9a31a88d1c42e9e0089d2 (diff) | |
| parent | 41c0dbfb3c6504f0b4d7e7da80bc21499f9de46d (diff) | |
| download | rabbitmq-server-git-3b0fddfd09bc5a7a040b3e55d948297cfed98e27.tar.gz | |
merge default into bug22756
| -rw-r--r-- | src/rabbit_channel.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 1f16ec080e..a48db9c8b3 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -138,7 +138,6 @@ info_all(Items) -> init([Channel, ReaderPid, WriterPid, Username, VHost]) -> process_flag(trap_exit, true), link(WriterPid), - rabbit_alarm:register(self(), {?MODULE, conserve_memory, []}), ok = pg_local:join(rabbit_channels, self()), {ok, #ch{state = starting, channel = Channel, @@ -353,6 +352,7 @@ queue_blocked(QPid, State = #ch{blocking = Blocking}) -> end. handle_method(#'channel.open'{}, _, State = #ch{state = starting}) -> + rabbit_alarm:register(self(), {?MODULE, conserve_memory, []}), {reply, #'channel.open_ok'{}, State#ch{state = running}}; handle_method(#'channel.open'{}, _, _State) -> |