summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-03-28 11:55:05 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-03-28 11:55:05 +0100
commitc9fa97452653795ba47467575d9de2a12cdecc98 (patch)
tree76f56329a872f7472540a5deae07ad954870da46 /src
parentf7eba489ce5d05610d6021b5d41b9523fae33c71 (diff)
parent68f615b277cf1c7cbfd548afcd9f6534203a681a (diff)
downloadrabbitmq-server-git-c9fa97452653795ba47467575d9de2a12cdecc98.tar.gz
Merge default
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_channel.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 0c12614cc6..5099bf3fbe 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -156,7 +156,6 @@ ready_for_close(Pid) ->
init([Channel, ReaderPid, WriterPid, ConnPid, Protocol, User, VHost,
Capabilities, CollectorPid, StartLimiterFun]) ->
- process_flag(trap_exit, true),
ok = pg_local:join(rabbit_channels, self()),
StatsTimer = rabbit_event:init_stats_timer(),
State = #ch{state = starting,