alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-06 18:26:33 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix mono project

Browse Source
This commit is contained in:
Luke Pulverenti
2016-11-12 17:46:38 -05:00
parent 1714cb8764
commit 102bbe2beb
6 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ServiceStack/Host/RestHandler.cs
View File

@@ -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)
{
var subTask = taskResult as Task;
if (subTask != null)
taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
return taskResult;
taskResult = ServiceStackHost.Instance.GetTaskResult(subTask, RequestName);
}
if (taskResults.Length == 0)
{
return new object[] { };
}
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);
}

21
ServiceStack/ServiceStackHost.Runtime.cs
View File

@@ -14,10 +14,8 @@ namespace ServiceStack
/// and no more processing should be done.
/// </summary>
/// <returns></returns>
public virtual bool ApplyRequestFilters(IRequest req, IResponse res, object requestDto)
public virtual void ApplyRequestFilters(IRequest req, IResponse res, object requestDto)
{
if (res.IsClosed) return res.IsClosed;
//Exec all RequestFilter attributes with Priority < 0
var attributes = FilterAttributeCache.GetRequestFilterAttributes(requestDto.GetType());
var i = 0;
@@ -25,16 +23,12 @@ namespace ServiceStack
{
var attribute = attributes[i];
attribute.RequestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
}
if (res.IsClosed) return res.IsClosed;
//Exec global filters
foreach (var requestFilter in GlobalRequestFilters)
{
requestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
}
//Exec remaining RequestFilter attributes with Priority >= 0
@@ -42,10 +36,7 @@ namespace ServiceStack
{
var attribute = attributes[i];
attribute.RequestFilter(req, res, requestDto);
if (res.IsClosed) return res.IsClosed;
}
return res.IsClosed;
}
/// <summary>
@@ -53,21 +44,13 @@ namespace ServiceStack
/// and no more processing should be done.
/// </summary>
/// <returns></returns>
public virtual bool ApplyResponseFilters(IRequest req, IResponse res, object response)
public virtual void ApplyResponseFilters(IRequest req, IResponse res, object response)
{
if (response != null)
{
if (res.IsClosed) return res.IsClosed;
}
//Exec global filters
foreach (var responseFilter in GlobalResponseFilters)
{
responseFilter(req, res, response);
if (res.IsClosed) return res.IsClosed;
}
return res.IsClosed;
}
}