jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #406 from CopernicaMarketingSoftware/40366 

Monitor earlier in case flush() calls reportError
This commit is contained in:
Emiel Bruijntjes 2021-07-12 15:55:52 +02:00 committed by GitHub
parent ead7b7962e e3678943cb
commit d91a67c13e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/amqpcpp/channelimpl.h
View File

@ -672,18 +672,21 @@ public:
// skip if there is no oldest callback
if (!_oldestCallback) return true;
// we are going to call callbacks that could destruct the channel
Monitor monitor(this);
// flush the queue, which will send the next operation if the current operation was synchronous
flush();
// the call to flush may have resulted in a call to reportError
if (!monitor.valid()) return false;
// copy the callback (so that it will not be destructed during
// the "reportSuccess" call, if the channel is destructed during the call)
auto cb = _oldestCallback;
// the call to flush might have caused the callback to have been invoked; check once more
if (!cb) return false;
// we are going to call callbacks that could destruct the channel
Monitor monitor(this);
if (!cb) return true;
// call the callback
auto next = cb->reportSuccess(std::forward<Arguments>(parameters)...);