summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-01-13 03:18:55 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2011-01-13 03:18:55 +0000
commit7304d31d8481b450f7742b05c484fa44842afbc1 (patch)
tree67915626b3d4eb55c351d4dd8b5170f6f9568657
parentc74e4426bddaf2d6dbf0a22f688b5402a54d1c54 (diff)
downloadrabbitmq-server-7304d31d8481b450f7742b05c484fa44842afbc1.tar.gz
Backed out changeset b6d2a6e12e77
Turns out this change is only valid on the bug23684 branch
-rw-r--r--src/rabbit_channel.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 7a19376b..a2a22f8a 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -473,6 +473,8 @@ queue_blocked(QPid, State = #ch{blocking = Blocking}) ->
confirm([], _QPid, State) ->
State;
+confirm(_MsgSeqNos, _QPid, State = #ch{confirm_enabled = false}) ->
+ State;
confirm(MsgSeqNos, undefined, State = #ch{unconfirmed = UC,
queues_for_msg = QFM}) ->
MsgSeqNos1 = [MSN || MSN <- MsgSeqNos, gb_sets:is_element(MSN, UC)],