diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-01-10 11:33:16 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-01-10 11:33:16 +0000 |
commit | ad2baf3b421c5f2b4e4c909c40d603d9acc26dbc (patch) | |
tree | 2da96681eeca3cc2bbb1a2a15f5982a48e48ef73 | |
parent | a62b696027babd1d858638bd4e8f944ab558a4ed (diff) | |
parent | 6a380541b983575c44b5e5c022855d94c92ebda8 (diff) | |
download | rabbitmq-server-ad2baf3b421c5f2b4e4c909c40d603d9acc26dbc.tar.gz |
merge stable into default
-rw-r--r-- | src/gm.erl | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -898,10 +898,10 @@ internal_broadcast(Msg, From, State = #state { self = Self, State1 = State #state { pub_count = PubCount1, confirms = Confirms1, broadcast_buffer = Buffer1 }, - handle_callback_result(case From of - none -> {Result, State1}; - _ -> {Result, flush_broadcast_buffer(State1)} - end). + handle_callback_result({Result, case From of + none -> State1; + _ -> flush_broadcast_buffer(State1) + end}). flush_broadcast_buffer(State = #state { broadcast_buffer = [] }) -> State; |