stable to default

Author: Simon MacMullen

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -323,8 +323,7 @@ uint QueueDelete(string queue,
         ///Waits until all messages published since the last call have
         ///been either ack'd or nack'd by the broker.  Returns whether
         ///all the messages were ack'd (and none were nack'd). Note,
-        ///when called on a non-Confirm channel, returns true
-        ///immediately.
+        ///throws an exception when called on a non-Confirm channel.
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]
         [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
@@ -345,8 +344,7 @@ uint QueueDelete(string queue,
         ///Waits until all messages published since the last call have
         ///been either ack'd or nack'd by the broker.  Returns whether
         ///all the messages were ack'd (and none were nack'd). Note,
-        ///when called on a non-Confirm channel, returns true
-        ///immediately.
+        ///throws an exception when called on a non-Confirm channel.
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]
         [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

@@ -960,6 +960,9 @@ public void ConfirmSelect()
 
         public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
         {
+            if (m_nextPubSeqNo == 0UL) {
+                throw new InvalidOperationException("Confirms not selected");
+            }
             bool isWaitInfinite = (timeout.TotalMilliseconds == Timeout.Infinite);
             Stopwatch stopwatch = Stopwatch.StartNew();
             lock (m_unconfirmedSet.SyncRoot)

projects/client/Unit/src/unit/TestExtensions.cs

@@ -72,10 +72,17 @@ public void TestExchangeBinding()
             Model.ExchangeDelete("dest");
         }
 
+        [Test]
+        public void TestConfirmBeforeWait()
+        {
+            Assert.Throws(
+                typeof (InvalidOperationException),
+                delegate { Model.WaitForConfirms(); });
+        }
+
         [Test]
         public void TestConfirmBarrier()
         {
-            Assert.That(Model.WaitForConfirms(), Is.Not.False);
             Model.ConfirmSelect();
             for (int i = 0; i < 10; i++)
                 Model.BasicPublish("", String.Empty, null, new byte[] { });