summaryrefslogtreecommitdiff
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
commit5188dcb8e5fd0e794aa5833dab3936f97e2d6046 (patch)
tree0277e5fd91d68b8e3802e226179e7cd469c1e486
parent3c7ab3edf549909510a903dda25d89fa74dea281 (diff)
downloadrabbitmq-server-bug24718.tar.gz
it helps to not throw away the statebug24718
it really does
-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 603091b1..d8f55085 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(