diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-02-11 16:03:07 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-02-11 16:03:07 +0000 |
| commit | 9bc47b08f57f23b3368631087519f177fc9262e8 (patch) | |
| tree | 9e31b89b2b2711e59603bb9e0c3df56ed69e060b | |
| parent | a15849a0616e6eb6d57cdedd79204e38b9deb9b0 (diff) | |
| download | rabbitmq-server-git-9bc47b08f57f23b3368631087519f177fc9262e8.tar.gz | |
minor refactor: move erase_tx call into commit_transaction
for symmetry with rollback_transaction
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 7aa0d32136..59ea353ca7 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -544,6 +544,7 @@ commit_transaction(Txn, From, State) -> {RunQueue, VQS} = rabbit_variable_queue:tx_commit( PendingMessagesOrdered, Acks, From, State #q.variable_queue_state), + erase_tx(Txn), {RunQueue, State #q { variable_queue_state = VQS }}. rollback_transaction(Txn, State) -> @@ -650,7 +651,6 @@ handle_call({deliver, Txn, Message, ChPid}, _From, State) -> handle_call({commit, Txn}, From, State) -> {RunQueue, NewState} = commit_transaction(Txn, From, State), - erase_tx(Txn), noreply(case RunQueue of true -> run_message_queue(NewState); false -> NewState |