Revert "Merge pull request #855 from bollhals/remove.task.yield"

lukebakken · lukebakken · commit aa5e8cb17edb · 2020-05-31T08:56:14.000-07:00
This reverts commit c395ca4, reversing changes made to ef01562.
diff --git a/projects/RabbitMQ.Client/client/impl/Work.cs b/projects/RabbitMQ.Client/client/impl/Work.cs
@@ -1,4 +1,5 @@
-﻿using System.Threading.Tasks;
+﻿using System;
+using System.Threading.Tasks;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -11,9 +12,17 @@ protected Work(IBasicConsumer consumer)
             _asyncConsumer = (IAsyncBasicConsumer)consumer;
         }
 
-        public Task Execute(ModelBase model)
+        public async Task Execute(ModelBase model)
         {
-            return Execute(model, _asyncConsumer);
+            try
+            {
+                await Task.Yield();
+                await Execute(model, _asyncConsumer).ConfigureAwait(false);
+            }
+            catch (Exception)
+            {
+                // intentionally caught
+            }
         }
 
         protected abstract Task Execute(ModelBase model, IAsyncBasicConsumer consumer);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Threading.Tasks;`
	`1`	`+using System;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`
`3`	`4`	`namespace RabbitMQ.Client.Impl`
`4`	`5`	`{`
`@@ -11,9 +12,17 @@ protected Work(IBasicConsumer consumer)`
`11`	`12`	`_asyncConsumer = (IAsyncBasicConsumer)consumer;`
`12`	`13`	`}`
`13`	`14`
`14`		`- public Task Execute(ModelBase model)`
	`15`	`+ public async Task Execute(ModelBase model)`
`15`	`16`	`{`
`16`		`- return Execute(model, _asyncConsumer);`
	`17`	`+ try`
	`18`	`+ {`
	`19`	`+ await Task.Yield();`
	`20`	`+ await Execute(model, _asyncConsumer).ConfigureAwait(false);`
	`21`	`+ }`
	`22`	`+ catch (Exception)`
	`23`	`+ {`
	`24`	`+ // intentionally caught`
	`25`	`+ }`
`17`	`26`	`}`
`18`	`27`
`19`	`28`	`protected abstract Task Execute(ModelBase model, IAsyncBasicConsumer consumer);`