summaryrefslogtreecommitdiff
path: root/src
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
commiteeedb301c253414d03a7d714f656ad83dbab0ca9 (patch)
tree67915626b3d4eb55c351d4dd8b5170f6f9568657 /src
parentbe5d43b675628e3d91dca154535f9e8c5b26b287 (diff)
downloadrabbitmq-server-git-eeedb301c253414d03a7d714f656ad83dbab0ca9.tar.gz
Backed out changeset b6d2a6e12e77
Turns out this change is only valid on the bug23684 branch
Diffstat (limited to 'src')
-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 7a19376b88..a2a22f8a07 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)],