Use overridable HostContext.Async for Validator RequestFilterAsync

ServiceStack · May 9, 2017 · b0aacff · b0aacff
1 parent 3cd0467
commit b0aacff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/ServiceStack/AsyncContext.cs b/src/ServiceStack/AsyncContext.cs
@@ -43,6 +43,11 @@ public virtual Task<object> ContinueWith(IRequest req, Task task, Func<Task, obj
             return task.ContinueWith(fn);
         }
 
+        public virtual Task<object> ContinueWith<T>(IRequest req, Task<T> task, Func<Task<T>, object> fn)
+        {
+            return task.ContinueWith(fn);
+        }
+
         public virtual Task<T> ContinueWith<T>(IRequest req, Task<object> task, Func<Task<object>, T> fn)
         {
             return task.ContinueWith(fn);

diff --git a/src/ServiceStack/Validation/ValidationFilters.cs b/src/ServiceStack/Validation/ValidationFilters.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.FluentValidation;
 using ServiceStack.Web;
@@ -46,19 +47,20 @@ public static Task RequestFilterAsync(IRequest req, IResponse res, object reques
             if (validator == null || !validator.HasAsyncValidators(ruleSet))
                 return TypeConstants.EmptyTask;
 
-            return validator.ValidateAsync(
+            var validateTask = validator.ValidateAsync(
                 new ValidationContext(requestDto, null, new MultiRuleSetValidatorSelector(ruleSet))
                 {
                     Request = req
-                })
-                .ContinueWith(t =>
+                });
+
+            return HostContext.Async.ContinueWith(req, validateTask, t =>
                 {
                     var validationResult = t.Result;
                     if (validationResult.IsValid)
                         return TypeConstants.TrueTask;
 
                     var errorResponse = HostContext.RaiseServiceException(req, requestDto, validationResult.ToException())
-                        ?? DtoUtils.CreateErrorResponse(requestDto, validationResult.ToErrorResult());
+                                        ?? DtoUtils.CreateErrorResponse(requestDto, validationResult.ToErrorResult());
 
                     var validationFeature = HostContext.GetPlugin<ValidationFeature>();
                     if (validationFeature?.ErrorResponseFilter != null)