From eccd25bedd73ac67a8536afd0b4f188af90df3aa Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 21 Aug 2014 11:55:41 -0700
Subject: [PATCH] Change ThrowIfFaulted to WaitAndThrowIfFaulted

---
 .../Internal/TaskHelper.cs                         |  6 +++---
 .../Rendering/Html/TemplateRenderer.cs             |  2 +-
 .../Internal/TaskHelperTest.cs                     | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/TaskHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskHelper.cs
index 92721c8aa7..f12375b07b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Internal/TaskHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskHelper.cs
@@ -11,13 +11,13 @@ namespace Microsoft.AspNet.Mvc.Internal
     public static class TaskHelper
     {
         /// <summary>
-        /// Throws the first faulting exception for a task which is faulted. It preserves the original stack trace when
-        /// throwing the exception.
+        /// Waits for the task to complete and throws the first faulting exception if the task is faulted. 
+        /// It preserves the original stack trace when throwing the exception.
         /// </summary>
         /// <remarks>
         /// Invoking this method is equivalent to calling Wait() on the <paramref name="task" /> if it is not completed.
         /// </remarks>
-        public static void ThrowIfFaulted(Task task)
+        public static void WaitAndThrowIfFaulted(Task task)
         {
             task.GetAwaiter().GetResult();
         }
diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs
index b045a3bfe6..eb14e9ccf8 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs
@@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
                         {
                             var viewContext = new ViewContext(_viewContext, viewEngineResult.View, _viewData, writer);
                             var renderTask = viewEngineResult.View.RenderAsync(viewContext);
-                            TaskHelper.ThrowIfFaulted(renderTask);
+                            TaskHelper.WaitAndThrowIfFaulted(renderTask);
                             return writer.ToString();
                         }
                     }
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs
index a37c88d731..c764fddc94 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs
@@ -10,40 +10,40 @@ namespace Microsoft.AspNet.Mvc.Internal
     public class TaskHelperTest
     {
         [Fact]
-        public void ThrowIfFaulted_DoesNotThrowIfTaskIsNotFaulted()
+        public void WaitAndThrowIfFaulted_DoesNotThrowIfTaskIsNotFaulted()
         {
             // Arrange
             var task = Task.FromResult(0);
 
             // Act and Assert
-            Assert.DoesNotThrow(() => TaskHelper.ThrowIfFaulted(task));
+            Assert.DoesNotThrow(() => TaskHelper.WaitAndThrowIfFaulted(task));
         }
 
         [Fact]
-        public void ThrowIfFaulted_ThrowsIfTaskIsFaulted()
+        public void WaitAndThrowIfFaulted_ThrowsIfTaskIsFaulted()
         {
             // Arrange
             var message = "Exception message";
             var task = CreatingFailingTask(message);
 
             // Act and Assert
-            var ex = Assert.Throws<Exception>(() => TaskHelper.ThrowIfFaulted(task));
+            var ex = Assert.Throws<Exception>(() => TaskHelper.WaitAndThrowIfFaulted(task));
             Assert.Equal(message, ex.Message);
         }
 
         [Fact]
-        public void ThrowIfFaulted_ThrowsFirstExceptionWhenAggregateTaskFails()
+        public void WaitAndThrowIfFaulted_ThrowsFirstExceptionWhenAggregateTaskFails()
         {
             // Arrange
             var message = "Exception message";
             var task = Task.Run(async () =>
             {
-                await Task.WhenAll(CreatingFailingTask(message), 
+                await Task.WhenAll(CreatingFailingTask(message),
                                    CreatingFailingTask("different message"));
             });
 
             // Act and Assert
-            var ex = Assert.Throws<Exception>(() => TaskHelper.ThrowIfFaulted(task));
+            var ex = Assert.Throws<Exception>(() => TaskHelper.WaitAndThrowIfFaulted(task));
             Assert.Equal(message, ex.Message);
         }