summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-11 15:24:44 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-11 15:24:44 +0000
commit6172b0449bdb68148bb4bbdb53b3fb1053c2f19e (patch)
treea421225de9170f3e3a0fdcb5124f3568b8a0821c /src
parent99f60e689edfcfb63f30d1b426f82a70ddd0160e (diff)
downloadrabbitmq-server-git-6172b0449bdb68148bb4bbdb53b3fb1053c2f19e.tar.gz
Do rollback first so that reader will catch DOWN if rollback errors
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_channel.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index df56ee49ad..b9d1baf060 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -556,10 +556,8 @@ handle_method(_Method, _, State = #ch{state = closing}) ->
{noreply, State};
handle_method(#'channel.close'{}, _, State = #ch{reader_pid = ReaderPid}) ->
- ReaderPid ! {channel_closing, self()},
- %% no error, so rollback_and_notify should be 'ok'. Do in parallel
- %% with the reader picking up our message and casting back to us.
{ok, State1} = rollback_and_notify(State),
+ ReaderPid ! {channel_closing, self()},
{noreply, State1};
handle_method(#'access.request'{},_, State) ->