summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-10-16 15:50:44 +0100
committerMatthew Sackman <matthew@lshift.net>2009-10-16 15:50:44 +0100
commit641a66abb12a2605c4538b53b336ca11755b0560 (patch)
treee63d92ba9da352f7ca97f42807f405aa0f73bf7a
parent6defdc9c1f59e95d802675eec3c2333ca45291f1 (diff)
downloadrabbitmq-server-git-641a66abb12a2605c4538b53b336ca11755b0560.tar.gz
Bug fix.
-rw-r--r--src/rabbit_amqqueue_process.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 66fc45ea26..7190953db0 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -575,7 +575,7 @@ handle_call({deliver, Txn, Message, ChPid}, _From, State) ->
handle_call({commit, Txn}, From, State) ->
NewState = commit_transaction(Txn, From, State),
erase_tx(Txn),
- noreply(run_message_queue(NewState));
+ noreply(NewState);
handle_call({notify_down, ChPid}, From, State) ->
%% optimisation: we reply straight away so the sender can continue
@@ -783,9 +783,10 @@ handle_cast({notify_sent, ChPid}, State) ->
handle_cast({tx_commit_callback, Pubs, AckTags, From},
State = #q{variable_queue_state = VQS}) ->
- noreply(State#q{variable_queue_state =
- rabbit_variable_queue:do_tx_commit(
- Pubs, AckTags, From, VQS)});
+ noreply(
+ run_message_queue(
+ State#q{variable_queue_state =
+ rabbit_variable_queue:do_tx_commit(Pubs, AckTags, From, VQS)}));
handle_cast({limit, ChPid, LimiterPid}, State) ->
noreply(