summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-07-22 13:45:01 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-07-22 13:45:01 +0100
commit13cec157bdf77ed373795187d3df2349d823e4b3 (patch)
tree8765d6aaffc2e4cb25794d91b4c1553c4ab93890
parent5d339c4f90d0472c083f99ce867cc4f05aa20f77 (diff)
downloadrabbitmq-server-git-13cec157bdf77ed373795187d3df2349d823e4b3.tar.gz
Actually, hold on to confirms when pausing. It's not inconceivable that we might get a false positive from pause_minority_guard, in which case we don't want to throw data away.
-rw-r--r--src/rabbit_channel.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 27a7d208b5..043ec7e363 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1574,7 +1574,7 @@ send_confirms(State = #ch{tx = none, confirmed = C}) ->
[MsgSeqNo | MSNs]
end, [], lists:append(C)),
send_confirms(MsgSeqNos, State#ch{confirmed = []});
- pausing -> State#ch{confirmed = []}
+ pausing -> State
end;
send_confirms(State) ->
case rabbit_node_monitor:pause_minority_guard() of