Merge pull request #93 from doomchild/bugfix/issue-92

Issue-92: Fix extra wrapping of Filter exceptions
doomchild · Nov 22, 2024 · 80cb366 · 80cb366
2 parents 5a6a8b3 + e5b3990
commit 80cb366
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/TaskExtensions.cs b/src/TaskExtensions.cs
@@ -226,7 +226,7 @@ Func<T, Task<E>> morphism
 
       return predicate(result) == true
         ? Task.FromResult(result)
-        : morphism(result).ContinueWith(failureTask => Task.FromException<T>(PotentiallyUnwindException(failureTask.Result))).Unwrap();
+        : morphism(result).Then(failureTask => Task.FromException<T>(PotentiallyUnwindException(failureTask)));
     }).Unwrap();
   }
 
@@ -280,10 +280,10 @@ Func<T, Exception> morphism
       T predicateValue = continuationTask.Result;
 
       return predicate(predicateValue)
-        .ContinueWith(predicateTask => predicateTask.Result
-                      ? Task.FromResult(predicateValue)
-                      : Task.FromException<T>(PotentiallyUnwindException(morphism(predicateValue)))
-        ).Unwrap();
+        .Then(predicateResult => predicateResult
+          ? Task.FromResult(predicateValue)
+          : Task.FromException<T>(PotentiallyUnwindException(morphism(predicateValue)))
+        );
     }).Unwrap();
   }
 
@@ -312,7 +312,7 @@ Func<Task<E>> morphism
       {
         return predicateTask.Result
           ? Task.FromResult(continuationValue)
-          : morphism().ContinueWith(morphismTask => Task.FromException<T>(PotentiallyUnwindException(morphismTask.Result))).Unwrap();
+          : morphism().Then(exception => Task.FromException<T>(PotentiallyUnwindException(exception)));
       }).Unwrap();
     }).Unwrap();
   }
@@ -342,7 +342,7 @@ Func<T, Task<E>> morphism
       {
         return predicateTask.Result
           ? Task.FromResult(continuationValue)
-          : morphism(continuationValue).ContinueWith(morphismTask => Task.FromException<T>(PotentiallyUnwindException(morphismTask.Result))).Unwrap();
+          : morphism(continuationValue).Then(exception => Task.FromException<T>(PotentiallyUnwindException(exception)));
       }).Unwrap();
     }).Unwrap();
   }