diff --git a/include/amqpcpp/channelimpl.h b/include/amqpcpp/channelimpl.h index 71a08a33..a129fc38 100644 --- a/include/amqpcpp/channelimpl.h +++ b/include/amqpcpp/channelimpl.h @@ -574,10 +574,10 @@ class ChannelImpl : public Watchable, public std::enable_shared_from_thisreportSuccess(consumerTag())) channel->onSynchronized(); + channel->reportSuccess(consumerTag()); // done return true; diff --git a/src/basicconsumeokframe.h b/src/basicconsumeokframe.h index 9ec63976..129419d5 100644 --- a/src/basicconsumeokframe.h +++ b/src/basicconsumeokframe.h @@ -94,7 +94,7 @@ class BasicConsumeOKFrame : public BasicFrame if (!channel) return false; // report - if (channel->reportSuccess(consumerTag())) channel->onSynchronized(); + channel->reportSuccess(consumerTag()); // done return true; diff --git a/src/basicgetemptyframe.h b/src/basicgetemptyframe.h index 656c2df0..3efa9750 100644 --- a/src/basicgetemptyframe.h +++ b/src/basicgetemptyframe.h @@ -84,7 +84,7 @@ class BasicGetEmptyFrame : public BasicFrame if (!channel) return false; // report - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/basicqosokframe.h b/src/basicqosokframe.h index 6698668a..72aa90a2 100644 --- a/src/basicqosokframe.h +++ b/src/basicqosokframe.h @@ -67,7 +67,7 @@ class BasicQosOKFrame : public BasicFrame if (!channel) return false; // report - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/channelcloseokframe.h b/src/channelcloseokframe.h index 1c8bd1ed..9be59a93 100644 --- a/src/channelcloseokframe.h +++ b/src/channelcloseokframe.h @@ -72,7 +72,7 @@ class ChannelCloseOKFrame : public ChannelFrame if (!channel) return false; // report that the channel is closed - if (channel->reportClosed()) channel->onSynchronized(); + channel->reportClosed(); // done return true; diff --git a/src/channelflowokframe.h b/src/channelflowokframe.h index 2111253c..d5c5aa03 100644 --- a/src/channelflowokframe.h +++ b/src/channelflowokframe.h @@ -93,7 +93,7 @@ class ChannelFlowOKFrame : public ChannelFrame if (!channel) return false; // report success for the call - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/channelimpl.cpp b/src/channelimpl.cpp index 60054d02..3d9311fa 100644 --- a/src/channelimpl.cpp +++ b/src/channelimpl.cpp @@ -754,7 +754,7 @@ bool ChannelImpl::send(const Frame &frame) * Signal the channel that a synchronous operation was completed. After * this operation, waiting frames can be sent out. */ -void ChannelImpl::onSynchronized() +void ChannelImpl::flush() { // we are no longer waiting for synchronous operations _synchronous = false; diff --git a/src/confirmselectokframe.h b/src/confirmselectokframe.h index 4a20992d..c91c0184 100644 --- a/src/confirmselectokframe.h +++ b/src/confirmselectokframe.h @@ -75,7 +75,7 @@ class ConfirmSelectOKFrame : public ConfirmFrame if(!channel) return false; // report that the channel is open - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/deferredget.cpp b/src/deferredget.cpp index e8985f19..743ce87b 100644 --- a/src/deferredget.cpp +++ b/src/deferredget.cpp @@ -62,7 +62,7 @@ const std::shared_ptr &DeferredGet::reportSuccess() const void DeferredGet::complete() { // the channel is now synchronized, delayed frames may now be sent - _channel->onSynchronized(); + _channel->flush(); // pass on to normal implementation DeferredExtReceiver::complete(); diff --git a/src/exchangebindokframe.h b/src/exchangebindokframe.h index 6116eca7..bbba17c1 100644 --- a/src/exchangebindokframe.h +++ b/src/exchangebindokframe.h @@ -67,7 +67,7 @@ class ExchangeBindOKFrame : public ExchangeFrame if(!channel) return false; // report to handler - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/exchangedeclareokframe.h b/src/exchangedeclareokframe.h index 83347572..8d560305 100644 --- a/src/exchangedeclareokframe.h +++ b/src/exchangedeclareokframe.h @@ -70,7 +70,7 @@ class ExchangeDeclareOKFrame : public ExchangeFrame if(!channel) return false; // report exchange declare ok - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/exchangedeleteokframe.h b/src/exchangedeleteokframe.h index 7f6dba07..624cc84a 100644 --- a/src/exchangedeleteokframe.h +++ b/src/exchangedeleteokframe.h @@ -71,7 +71,7 @@ class ExchangeDeleteOKFrame : public ExchangeFrame if(!channel) return false; // report to handler - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/exchangeunbindokframe.h b/src/exchangeunbindokframe.h index 511b8fe2..3a300507 100644 --- a/src/exchangeunbindokframe.h +++ b/src/exchangeunbindokframe.h @@ -68,7 +68,7 @@ class ExchangeUnbindOKFrame : public ExchangeFrame if(!channel) return false; // report to handler - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/queuebindokframe.h b/src/queuebindokframe.h index b80b11b9..e4e55e89 100644 --- a/src/queuebindokframe.h +++ b/src/queuebindokframe.h @@ -69,7 +69,7 @@ class QueueBindOKFrame : public QueueFrame if(!channel) return false; // report to handler - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/queuedeclareokframe.h b/src/queuedeclareokframe.h index 99ad1e86..ca545e9b 100644 --- a/src/queuedeclareokframe.h +++ b/src/queuedeclareokframe.h @@ -133,7 +133,7 @@ class QueueDeclareOKFrame : public QueueFrame if (!channel) return false; // report success - if (channel->reportSuccess(name(), messageCount(), consumerCount())) channel->onSynchronized(); + channel->reportSuccess(name(), messageCount(), consumerCount()); // done return true; diff --git a/src/queuedeleteokframe.h b/src/queuedeleteokframe.h index e8bc7115..b7ece3fd 100644 --- a/src/queuedeleteokframe.h +++ b/src/queuedeleteokframe.h @@ -94,7 +94,7 @@ class QueueDeleteOKFrame : public QueueFrame if(!channel) return false; // report queue deletion success - if (channel->reportSuccess(this->messageCount())) channel->onSynchronized(); + channel->reportSuccess(this->messageCount()); // done return true; diff --git a/src/queuepurgeokframe.h b/src/queuepurgeokframe.h index 22cf1194..9098a769 100644 --- a/src/queuepurgeokframe.h +++ b/src/queuepurgeokframe.h @@ -94,7 +94,7 @@ class QueuePurgeOKFrame : public QueueFrame if(!channel) return false; // report queue purge success - if (channel->reportSuccess(this->messageCount())) channel->onSynchronized(); + channel->reportSuccess(this->messageCount()); // done return true; diff --git a/src/queueunbindokframe.h b/src/queueunbindokframe.h index 893908d0..d57cff05 100644 --- a/src/queueunbindokframe.h +++ b/src/queueunbindokframe.h @@ -73,7 +73,7 @@ class QueueUnbindOKFrame : public QueueFrame if(!channel) return false; // report queue unbind success - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/transactioncommitokframe.h b/src/transactioncommitokframe.h index a02857d5..0b4bbfb4 100644 --- a/src/transactioncommitokframe.h +++ b/src/transactioncommitokframe.h @@ -74,7 +74,7 @@ class TransactionCommitOKFrame : public TransactionFrame if(!channel) return false; // report that the channel is open - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/transactionrollbackokframe.h b/src/transactionrollbackokframe.h index d04532f0..ecbb98b4 100644 --- a/src/transactionrollbackokframe.h +++ b/src/transactionrollbackokframe.h @@ -74,7 +74,7 @@ class TransactionRollbackOKFrame : public TransactionFrame if(!channel) return false; // report that the channel is open - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true; diff --git a/src/transactionselectokframe.h b/src/transactionselectokframe.h index f83e8038..35737e48 100644 --- a/src/transactionselectokframe.h +++ b/src/transactionselectokframe.h @@ -74,7 +74,7 @@ class TransactionSelectOKFrame : public TransactionFrame if(!channel) return false; // report that the channel is open - if (channel->reportSuccess()) channel->onSynchronized(); + channel->reportSuccess(); // done return true;