Merge pull request #298 from CopernicaMarketingSoftware/synchronous-fix

fix for incorrect handling of synchronous flag
CopernicaMarketingSoftware · Jun 19, 2019 · 5a648fe · 5a648fe
2 parents f107b4a + 7b79b7c
commit 5a648fe
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 29 deletions.
diff --git a/include/amqpcpp/channelimpl.h b/include/amqpcpp/channelimpl.h
@@ -574,10 +574,10 @@ class ChannelImpl : public Watchable, public std::enable_shared_from_this<Channe
     }
 
     /**
-     *  Signal the channel that a synchronous operation was completed.
-     *  After this operation, waiting frames can be sent out.
+     *  Signal the channel that a synchronous operation was completed, and that any
+     *  queued frames can be sent out.
      */
-    void onSynchronized();
+    void flush();
 
     /**
      *  Report to the handler that the channel is opened
@@ -596,8 +596,8 @@ class ChannelImpl : public Watchable, public std::enable_shared_from_this<Channe
         // inform handler
         if (_readyCallback) _readyCallback();
 
-        // if the monitor is still valid, we exit synchronous mode now
-        if (monitor.valid()) onSynchronized();
+        // if the monitor is still valid, we flush any waiting operations 
+        if (monitor.valid()) flush();
     }
 
     /**
@@ -644,10 +644,10 @@ class ChannelImpl : public Watchable, public std::enable_shared_from_this<Channe
     {
         // skip if there is no oldest callback
         if (!_oldestCallback) return true;
-
-        // the last (possibly synchronous) operation was received, so we're no longer in synchronous mode
-        if (_synchronous && _queue.empty()) _synchronous = false;
 
+        // flush the queue, which will send the next operation if the current operation was synchronous
+        flush();
+
         // we are going to call callbacks that could destruct the channel
         Monitor monitor(this);
 

diff --git a/src/basiccancelokframe.h b/src/basiccancelokframe.h
@@ -94,7 +94,7 @@ class BasicCancelOKFrame : public BasicFrame
         if (!channel) return false;
 
         // report
-        if (channel->reportSuccess<const std::string&>(consumerTag())) channel->onSynchronized();
+        channel->reportSuccess<const std::string&>(consumerTag());
 
         // done
         return true;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -62,7 +62,7 @@ const std::shared_ptr<Deferred> &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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;