commit fe657101365e13fb9606962fdc1fcb3160f00116
author Michael André Pearce <michaelpearce@apache.org> Thu Sep 12 20:21:10 2019 +0100
committer GitHub <noreply@github.com> Thu Sep 12 20:21:10 2019 +0100
tree e87b4f928435335451a27be67d1cd3210ad1c558
parent 962f1f17b4591fea3772cf484a835060925425e6
parent 720910eb900c4811e13c9eea209907e4b5edb3a4

Merge pull request #30 from Havret/exception_is_throw_on_transport_thread_during_shutdown

AMQNET-611: Apache.NMS.IllegalStateException is throw on transport thread

src/NMS.AMQP/NmsMessageConsumer.cs

diff --git a/src/NMS.AMQP/NmsMessageConsumer.cs b/src/NMS.AMQP/NmsMessageConsumer.cs
index 34afd0c..a8c65d5 100644
--- a/src/NMS.AMQP/NmsMessageConsumer.cs
+++ b/src/NMS.AMQP/NmsMessageConsumer.cs
@@ -408,7 +408,7 @@
             {
                 envelope.Message.NmsAcknowledgeCallback = new NmsAcknowledgeCallback(Session);
             }
-            else if (Session.AcknowledgementMode == AcknowledgementMode.IndividualAcknowledge)
+            else if (Session.IsIndividualAcknowledge())
             {
                 envelope.Message.NmsAcknowledgeCallback = new NmsAcknowledgeCallback(Session, envelope);
             }

src/NMS.AMQP/NmsSession.cs

diff --git a/src/NMS.AMQP/NmsSession.cs b/src/NMS.AMQP/NmsSession.cs
index c9f008d..1b1c0f6 100644
--- a/src/NMS.AMQP/NmsSession.cs
+++ b/src/NMS.AMQP/NmsSession.cs
@@ -592,5 +592,7 @@
                 consumer.OnConnectionInterrupted();
             }
         }
+
+        internal bool IsIndividualAcknowledge() => acknowledgementMode == AcknowledgementMode.IndividualAcknowledge;
     }
 }
\ No newline at end of file