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

michaelklishin · lukebakken · commit 0cd705eb4bf7 · 2020-06-12T08:31:53.000-07:00
remove task yield
diff --git a/projects/RabbitMQ.Client/client/impl/Work.cs b/projects/RabbitMQ.Client/client/impl/Work.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -12,17 +11,9 @@ protected Work(IBasicConsumer consumer)
             _asyncConsumer = (IAsyncBasicConsumer)consumer;
         }
 
-        public async Task Execute(ModelBase model)
+        public Task Execute(ModelBase model)
         {
-            try
-            {
-                await Task.Yield();
-                await Execute(model, _asyncConsumer).ConfigureAwait(false);
-            }
-            catch (Exception)
-            {
-                // intentionally caught
-            }
+            return Execute(model, _asyncConsumer);
         }
 
         protected abstract Task Execute(ModelBase model, IAsyncBasicConsumer consumer);

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