diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 17:21:59 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 17:21:59 +0100 |
| commit | 3f3caf736eed01f3670ca6d69b4a1a89952910d3 (patch) | |
| tree | 4c15429f95425290b4940969a841d64259db121c | |
| parent | 249397d53e858f49e5d55fb0f190555953b93add (diff) | |
| download | rabbitmq-server-3f3caf736eed01f3670ca6d69b4a1a89952910d3.tar.gz | |
cosmetic
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_invariable_queue.erl | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index d941fd35..ff43accc 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -785,8 +785,8 @@ handle_call({basic_get, ChPid, NoAck}, _From, reply(empty, State2); {{Message, IsDelivered, AckTag, Remaining}, State2} -> case AckRequired of - true -> C = #cr{acktags = ChAckTags} = ch_record(ChPid), - store_ch_record( + true -> C = #cr{acktags = ChAckTags} = ch_record(ChPid), + store_ch_record( C#cr{acktags = sets:add_element(AckTag, ChAckTags)}); false -> ok end, diff --git a/src/rabbit_invariable_queue.erl b/src/rabbit_invariable_queue.erl index 2415468f..bc58cc8c 100644 --- a/src/rabbit_invariable_queue.erl +++ b/src/rabbit_invariable_queue.erl @@ -105,8 +105,7 @@ publish(Msg, MsgProps, State = #iv_state { queue = Q, durable = IsDurable, len = Len }) -> ok = persist_message(QName, IsDurable, none, Msg, MsgProps), - Q1 = enqueue(Msg, MsgProps, false, Q), - State #iv_state { queue = Q1, len = Len + 1 }. + State #iv_state { queue = enqueue(Msg, MsgProps, false, Q), len = Len + 1 }. publish_delivered(false, _Msg, _MsgProps, State) -> {blank_ack, State}; @@ -163,7 +162,7 @@ ack(AckTags, State = #iv_state { qname = QName, durable = IsDurable, State #iv_state { pending_ack = PA1 }. tx_publish(Txn, Msg, MsgProps, State = #iv_state { qname = QName, - durable = IsDurable }) -> + durable = IsDurable }) -> Tx = #tx { pending_messages = Pubs } = lookup_tx(Txn), store_tx(Txn, Tx #tx { pending_messages = [{Msg, MsgProps} | Pubs] }), ok = persist_message(QName, IsDurable, Txn, Msg, MsgProps), |