Merge branch 'benaadams/result-getawaiter' into dev

2015-11-12 16:05:50 -08:00 · 2015-11-12 16:05:50 -08:00 · 9958427db7
parent 0ead24680d 0500043cc9
commit 9958427db7
1 changed files with 1 additions and 1 deletions
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http

        public override int Read(byte[] buffer, int offset, int count)
        {
-            return ReadAsync(buffer, offset, count).Result;
+            return ReadAsync(buffer, offset, count).GetAwaiter().GetResult();
        }

 #if NET451