fix: Switched validation order of timeout and task completion

dailydevops · Sep 5, 2023 · 90ebc8d · 90ebc8d
1 parent c171ecb
commit 90ebc8d
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 36 deletions.
diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,Timespan).cs
@@ -32,17 +32,17 @@ public static async Task<bool> WithTimeoutAsync(
         Argument.ThrowIfNull(task);
         Argument.ThrowIfLessThan(timeout, Timeout.InfiniteTimeSpan);
 
-        if (task.IsCompleted)
-        {
-            return true;
-        }
-
         if (timeout <= TimeSpan.Zero)
         {
             await task.ConfigureAwait(false);
             return timeout == Timeout.InfiniteTimeSpan;
         }
 
+        if (task.IsCompleted)
+        {
+            return true;
+        }
+
         var winner = await Task.WhenAny(task, Task.Delay(timeout, cancellationToken))
             .ConfigureAwait(false);
         await winner.ConfigureAwait(false);

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(Task,int).cs
@@ -32,17 +32,17 @@ public static async Task<bool> WithTimeoutAsync(
         Argument.ThrowIfNull(task);
         Argument.ThrowIfLessThan(timeoutInMilliseconds, Timeout.Infinite);
 
-        if (task.IsCompleted)
-        {
-            return true;
-        }
-
         if (timeoutInMilliseconds <= 0)
         {
             await task.ConfigureAwait(false);
             return timeoutInMilliseconds == Timeout.Infinite;
         }
 
+        if (task.IsCompleted)
+        {
+            return true;
+        }
+
         var winner = await Task.WhenAny(task, Task.Delay(timeoutInMilliseconds, cancellationToken))
             .ConfigureAwait(false);
         await winner.ConfigureAwait(false);

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,Timespan).cs
@@ -32,14 +32,14 @@ public static partial class TaskExtensions
         Argument.ThrowIfNull(task);
         Argument.ThrowIfLessThan(timeout, Timeout.InfiniteTimeSpan);
 
-        if (task.IsCompleted)
+        if (timeout <= TimeSpan.Zero)
         {
-            return (true, await task.ConfigureAwait(false));
+            return (timeout == Timeout.InfiniteTimeSpan, await task.ConfigureAwait(false));
         }
 
-        if (timeout <= TimeSpan.Zero)
+        if (task.IsCompleted)
         {
-            return (timeout == Timeout.InfiniteTimeSpan, await task.ConfigureAwait(false));
+            return (true, await task.ConfigureAwait(false));
         }
 
         var winner = await Task.WhenAny(task, Task.Delay(timeout, cancellationToken))

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(TaskOfT,int).cs
@@ -31,14 +31,14 @@ public static partial class TaskExtensions
         Argument.ThrowIfNull(task);
         Argument.ThrowIfLessThan(timeoutInMilliseconds, Timeout.Infinite);
 
-        if (task.IsCompleted)
+        if (timeoutInMilliseconds <= 0)
         {
-            return (true, await task.ConfigureAwait(false));
+            return (timeoutInMilliseconds == Timeout.Infinite, await task.ConfigureAwait(false));
         }
 
-        if (timeoutInMilliseconds <= 0)
+        if (task.IsCompleted)
         {
-            return (timeoutInMilliseconds == Timeout.Infinite, await task.ConfigureAwait(false));
+            return (true, await task.ConfigureAwait(false));
         }
 
         var winner = await Task.WhenAny(task, Task.Delay(timeoutInMilliseconds, cancellationToken))

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,Timespan).cs
@@ -25,17 +25,17 @@ public static async ValueTask<bool> WithTimeoutAsync(
     {
         Argument.ThrowIfLessThan(timeout, Timeout.InfiniteTimeSpan);
 
-        if (task.IsCompleted)
-        {
-            return true;
-        }
-
         if (timeout <= TimeSpan.Zero)
         {
             await task.ConfigureAwait(false);
             return timeout == Timeout.InfiniteTimeSpan;
         }
 
+        if (task.IsCompleted)
+        {
+            return true;
+        }
+
         var todoTask = task.AsTask();
         var winner = await Task.WhenAny(todoTask, Task.Delay(timeout, cancellationToken))
             .ConfigureAwait(false);

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTask,int).cs
@@ -24,17 +24,17 @@ public static async ValueTask<bool> WithTimeoutAsync(
     {
         Argument.ThrowIfLessThan(timeoutInMilliseconds, Timeout.Infinite);
 
-        if (task.IsCompleted)
-        {
-            return true;
-        }
-
         if (timeoutInMilliseconds <= 0)
         {
             await task.ConfigureAwait(false);
             return timeoutInMilliseconds == Timeout.Infinite;
         }
 
+        if (task.IsCompleted)
+        {
+            return true;
+        }
+
         var todoTask = task.AsTask();
         var winner = await Task.WhenAny(
                 todoTask,

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,Timespan).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,Timespan).cs
@@ -25,14 +25,14 @@ public static partial class TaskExtensions
     {
         Argument.ThrowIfLessThan(timeout, Timeout.InfiniteTimeSpan);
 
-        if (task.IsCompleted)
+        if (timeout <= TimeSpan.Zero)
         {
-            return (true, await task.ConfigureAwait(false));
+            return (timeout == Timeout.InfiniteTimeSpan, await task.ConfigureAwait(false));
         }
 
-        if (timeout <= TimeSpan.Zero)
+        if (task.IsCompleted)
         {
-            return (timeout == Timeout.InfiniteTimeSpan, await task.ConfigureAwait(false));
+            return (true, await task.ConfigureAwait(false));
         }
 
         var todoTask = task.AsTask();

diff --git a/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,int).cs b/src/NetEvolve.Extensions.Tasks/TaskExtensions/WithTimeoutAsync(ValueTaskOfT,int).cs
@@ -24,14 +24,14 @@ public static partial class TaskExtensions
     {
         Argument.ThrowIfLessThan(timeoutInMilliseconds, Timeout.Infinite);
 
-        if (task.IsCompleted)
+        if (timeoutInMilliseconds <= 0)
         {
-            return (true, await task.ConfigureAwait(false));
+            return (timeoutInMilliseconds == Timeout.Infinite, await task.ConfigureAwait(false));
         }
 
-        if (timeoutInMilliseconds <= 0)
+        if (task.IsCompleted)
         {
-            return (timeoutInMilliseconds == Timeout.Infinite, await task.ConfigureAwait(false));
+            return (true, await task.ConfigureAwait(false));
         }
 
         var todoTask = task.AsTask();