diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-16 17:11:48 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-16 17:11:48 +0100 |
| commit | 092187dee9b4cb5c5c86bf38eb4d1d4a13978dbb (patch) | |
| tree | c5517653516d11c881c5b99c1965a08003aaa091 /src | |
| parent | af028953deb139b92a1cdaa455dae927a25b69cf (diff) | |
| download | rabbitmq-server-git-092187dee9b4cb5c5c86bf38eb4d1d4a13978dbb.tar.gz | |
set channel txn to none on rollback
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 5fda693524..f6d3d1a517 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -481,11 +481,12 @@ commit_transaction(Txn, From, ChPid, State = #q{backing_queue = BQ, end, State#q{backing_queue_state = BQS1}. -rollback_transaction(Txn, _ChPid, State = #q{backing_queue = BQ, +rollback_transaction(Txn, ChPid, State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> {_AckTags, BQS1} = BQ:tx_rollback(Txn, BQS), %% Iff we removed acktags from the channel record on ack+txn then %% we would add them back in here (would also require ChPid) + record_current_channel_tx(ChPid, none), State#q{backing_queue_state = BQS1}. collect_messages(AckTags, UAM) -> |