diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-17 13:25:40 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-01-17 13:25:40 +0000 |
| commit | 6793d9c9012f4c044c019cae20ba4a88ba4a8001 (patch) | |
| tree | 000614916751c0d8c5a98d608e6f9d1fddefa01d | |
| parent | a41873bf3b2750a941a872d47e16483cd1fe5166 (diff) | |
| parent | 95dc7e75b22adea0a474ad28596dfd51adec765b (diff) | |
| download | rabbitmq-server-git-6793d9c9012f4c044c019cae20ba4a88ba4a8001.tar.gz | |
Merging default into bug23631
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 1e9096862b..5c900b0b87 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -283,7 +283,7 @@ handle_cast(emit_stats, State = #ch{stats_timer = StatsTimer}) -> hibernate}; handle_cast({confirm, MsgSeqNos, From}, State) -> - {noreply, confirm(MsgSeqNos, From, State)}. + {noreply, confirm(MsgSeqNos, From, State), hibernate}. handle_info({'DOWN', _MRef, process, QPid, _Reason}, State = #ch{unconfirmed = UC}) -> diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 52f5b3cc14..d8a222d15b 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -2090,12 +2090,13 @@ test_queue_recover() -> TxID = rabbit_guid:guid(), {new, #amqqueue { pid = QPid, name = QName }} = rabbit_amqqueue:declare(test_queue(), true, false, [], none), - Msg = rabbit_basic:message(rabbit_misc:r(<<>>, exchange, <<>>), - <<>>, #'P_basic'{delivery_mode = 2}, <<>>), - Delivery = #delivery{mandatory = false, immediate = false, txn = TxID, - sender = self(), message = Msg}, - [true = rabbit_amqqueue:deliver(QPid, Delivery) || - _ <- lists:seq(1, Count)], + [begin + Msg = rabbit_basic:message(rabbit_misc:r(<<>>, exchange, <<>>), + <<>>, #'P_basic'{delivery_mode = 2}, <<>>), + Delivery = #delivery{mandatory = false, immediate = false, txn = TxID, + sender = self(), message = Msg}, + true = rabbit_amqqueue:deliver(QPid, Delivery) + end || _ <- lists:seq(1, Count)], rabbit_amqqueue:commit_all([QPid], TxID, self()), exit(QPid, kill), MRef = erlang:monitor(process, QPid), |