From fbf8cc833c441de8890998600be044296acfc783 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Tue, 21 Aug 2012 22:50:59 -0400
Subject: a few more async optimizations

---
 MediaBrowser.Common/Net/Handlers/BaseHandler.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Common/Net/Handlers/BaseHandler.cs')

diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
index 7a4efdaf2b..19a1e7af7b 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
@@ -185,11 +185,11 @@ namespace MediaBrowser.Common.Net.Handlers
                 // When serving a range request, we need to return status code 206 to indicate a partial response body
                 StatusCode = SupportsByteRangeRequests && IsRangeRequest ? 206 : 200;
 
-                ctx.Response.ContentType = await GetContentType();
+                ctx.Response.ContentType = await GetContentType().ConfigureAwait(false);
 
                 TimeSpan cacheDuration = CacheDuration;
 
-                DateTime? lastDateModified = await GetLastDateModified();
+                DateTime? lastDateModified = await GetLastDateModified().ConfigureAwait(false);
 
                 if (ctx.Request.Headers.AllKeys.Contains("If-Modified-Since"))
                 {
@@ -205,13 +205,13 @@ namespace MediaBrowser.Common.Net.Handlers
                     }
                 }
 
-                await PrepareResponse();
+                await PrepareResponse().ConfigureAwait(false);
 
                 if (IsResponseValid)
                 {
                     bool compressResponse = ShouldCompressResponse(ctx.Response.ContentType) && ClientSupportsCompression;
 
-                    await ProcessUncachedRequest(ctx, compressResponse, cacheDuration, lastDateModified);
+                    await ProcessUncachedRequest(ctx, compressResponse, cacheDuration, lastDateModified).ConfigureAwait(false);
                 }
                 else
                 {
@@ -285,7 +285,7 @@ namespace MediaBrowser.Common.Net.Handlers
                     outputStream = CompressedStream;
                 }
 
-                await WriteResponseToOutputStream(outputStream);
+                await WriteResponseToOutputStream(outputStream).ConfigureAwait(false);
             }
             else
             {
@@ -307,7 +307,7 @@ namespace MediaBrowser.Common.Net.Handlers
         /// </summary>
         protected virtual Task PrepareResponse()
         {
-            return Task.Run(() => { });
+            return Task.FromResult<object>(null);
         }
 
         protected abstract Task WriteResponseToOutputStream(Stream stream);
@@ -359,7 +359,7 @@ namespace MediaBrowser.Common.Net.Handlers
         {
             DateTime? value = null;
 
-            return Task.Run<DateTime?>(() => { return value; });
+            return Task.FromResult<DateTime?>(value);
         }
 
         private bool IsResponseValid
-- 
cgit v1.2.3