summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-01-30 18:59:41 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-01-30 18:59:41 +0000
commit840394831874df48862f35399454848b36bed9c5 (patch)
tree0277e5fd91d68b8e3802e226179e7cd469c1e486 /src
parent9ae275a2d34a2911f9650960b611433807f38f24 (diff)
downloadrabbitmq-server-git-840394831874df48862f35399454848b36bed9c5.tar.gz
it helps to not throw away the state
it really does
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_channel.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 603091b1e0..d8f5508573 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1085,9 +1085,9 @@ handle_method(#'tx.commit'{}, _, #ch{tx_status = none}) ->
handle_method(#'tx.commit'{}, _, State = #ch{uncommitted_message_q = TMQ,
uncommitted_acks = TAL}) ->
- ack(TAL, rabbit_misc:queue_fold(fun deliver_to_queues/2, State, TMQ)),
- State1 = new_tx(State),
- {noreply, maybe_complete_tx(State1#ch{tx_status = committing})};
+ State1 = rabbit_misc:queue_fold(fun deliver_to_queues/2, State, TMQ),
+ ack(TAL, State1),
+ {noreply, maybe_complete_tx(new_tx(State1#ch{tx_status = committing}))};
handle_method(#'tx.rollback'{}, _, #ch{tx_status = none}) ->
rabbit_misc:protocol_error(