Merge pull request #773 from danielmarbach/model-shutdown

lukebakken · lukebakken · commit bcfc454bb26a · 2020-03-25T14:49:23.000-07:00
Schedule instead of GetAwaiter().GetResult() (cherry picked from commit c0178a2)
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AsyncConsumerDispatcher.cs b/projects/client/RabbitMQ.Client/src/client/impl/AsyncConsumerDispatcher.cs
@@ -59,7 +59,7 @@ public void HandleBasicCancel(IBasicConsumer consumer, string consumerTag)
         public void HandleModelShutdown(IBasicConsumer consumer, ShutdownEventArgs reason)
         {
             // the only case where we ignore the shutdown flag.
-            new ModelShutdown(consumer, reason).Execute(model).GetAwaiter().GetResult();
+            Schedule(new ModelShutdown(consumer, reason));
         }
 
         private void ScheduleUnlessShuttingDown<TWork>(TWork work)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void HandleBasicCancel(IBasicConsumer consumer, string consumerTag)`
`59`	`59`	`public void HandleModelShutdown(IBasicConsumer consumer, ShutdownEventArgs reason)`
`60`	`60`	`{`
`61`	`61`	`// the only case where we ignore the shutdown flag.`
`62`		`- new ModelShutdown(consumer, reason).Execute(model).GetAwaiter().GetResult();`
	`62`	`+ Schedule(new ModelShutdown(consumer, reason));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`private void ScheduleUnlessShuttingDown<TWork>(TWork work)`