aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-08 20:46:11 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-08 20:46:11 -0400
commit651d483dec489a84bf93fe900e537cc7be9c4cbd (patch)
tree58933f9a84a82e1a1db89c7d7dfa975de7575700 /MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
parentc02e917f5657db4bd76fc6ca17c535fc441c641c (diff)
rework nfo savers
Diffstat (limited to 'MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs')
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 925ef8050..8831d635c 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -382,9 +382,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
return result;
}
+ return GetNonCachedResult(requestContext, contentType, factoryFn, responseHeaders, isHeadRequest);
+ }
+
+ private async Task<IHasOptions> GetNonCachedResult(IRequest requestContext, string contentType, Func<Task<Stream>> factoryFn, IDictionary<string, string> responseHeaders = null, bool isHeadRequest = false)
+ {
var compress = ShouldCompressResponse(requestContext, contentType);
- var hasOptions = GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).Result;
+ var hasOptions = await GetStaticResult(requestContext, responseHeaders, contentType, factoryFn, compress, isHeadRequest).ConfigureAwait(false);
AddResponseHeaders(hasOptions, responseHeaders);