Merge pull request #2284 from MediaBrowser/dev

Dev

1 files changed, 6 insertions, 30 deletions

diff --git a/ServiceStack/Host/RestHandler.cs b/ServiceStack/Host/RestHandler.cs
index 5c360d150..1eae6be38 100644
--- a/ServiceStack/Host/RestHandler.cs
+++ b/ServiceStack/Host/RestHandler.cs
@@ -23,32 +23,13 @@ namespace ServiceStack.Host
 
             var taskResult = ServiceStackHost.Instance.GetTaskResult(taskResponse, RequestName);
 
-            var taskResults = taskResult as Task[];
-
-            if (taskResults == null)
-            {
-                var subTask = taskResult as Task;
-                if (subTask != null)
-                    taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
-
-                return taskResult;
-            }
-
-            if (taskResults.Length == 0)
+            var subTask = taskResult as Task;
+            if (subTask != null)
             {
-                return new object[] { };
+                taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
             }
 
-            var firstResponse = ServiceStackHost.Instance.GetTaskResult(taskResults[0], RequestName);
-            var batchedResponses = firstResponse != null
-                ? (object[])Array.CreateInstance(firstResponse.GetType(), taskResults.Length)
-                : new object[taskResults.Length];
-            batchedResponses[0] = firstResponse;
-            for (var i = 1; i < taskResults.Length; i++)
-            {
-                batchedResponses[i] = ServiceStackHost.Instance.GetTaskResult(taskResults[i], RequestName);
-            }
-            return batchedResponses;
+            return taskResult;
         }
 
         protected static object CreateContentTypeRequest(IRequest httpReq, Type requestType, string contentType)
@@ -141,18 +122,13 @@ namespace ServiceStack.Host
 
             var request = httpReq.Dto = CreateRequest(httpReq, restPath);
 
-            if (appHost.ApplyRequestFilters(httpReq, httpRes, request))
-                return;
+            appHost.ApplyRequestFilters(httpReq, httpRes, request);
 
             var rawResponse = await ServiceStackHost.Instance.ServiceController.Execute(request, httpReq).ConfigureAwait(false);
 
-            if (httpRes.IsClosed)
-                return;
-
             var response = await HandleResponseAsync(rawResponse).ConfigureAwait(false);
 
-            if (appHost.ApplyResponseFilters(httpReq, httpRes, response))
-                return;
+            appHost.ApplyResponseFilters(httpReq, httpRes, response);
 
             await httpRes.WriteToResponse(httpReq, response).ConfigureAwait(false);
         }