Throw an exception when ExecuteTaskAsync fails

restsharp · Aug 19, 2013 · 43d41ce · 43d41ce
1 parent e49f258
commit 43d41ce
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/RestSharp.Net4/Extensions/ResponseStatusExtensions.cs b/RestSharp.Net4/Extensions/ResponseStatusExtensions.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Net;
+
+namespace RestSharp.Extensions
+{
+	public static class ResponseStatusExtensions
+	{
+		/// <summary>
+		/// Convert a <see cref="ResponseStatus"/> to a <see cref="WebException"/> instance.
+		/// </summary>
+		/// <param name="responseStatus">The response status.</param>
+		/// <returns></returns>
+		/// <exception cref="System.ArgumentOutOfRangeException">responseStatus</exception>
+		public static WebException ToWebException(this ResponseStatus responseStatus)
+		{
+			switch (responseStatus)
+			{
+				case ResponseStatus.None:
+					return new WebException("The request could not be processed.", WebExceptionStatus.ServerProtocolViolation);
+				case ResponseStatus.Error:
+					return new WebException("An error occured while processing the request.", WebExceptionStatus.ServerProtocolViolation);
+				case ResponseStatus.TimedOut:
+					return new WebException("The request timed-out.", WebExceptionStatus.Timeout);
+				case ResponseStatus.Aborted:
+					return new WebException("The request was aborted.", WebExceptionStatus.Timeout);
+				default:
+					throw new ArgumentOutOfRangeException("responseStatus");
+			}
+		}
+	}
+}
diff --git a/RestSharp.Net4/RestSharp.Net4.csproj b/RestSharp.Net4/RestSharp.Net4.csproj
@@ -257,6 +257,7 @@
     <Compile Include="..\restsharp\validation\Validate.cs">
       <Link>Validation\Validate.cs</Link>
     </Compile>
+    <Compile Include="Extensions\ResponseStatusExtensions.cs" />
     <Compile Include="Extensions\RestClientExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/RestSharp/RestClient.Async.cs b/RestSharp/RestClient.Async.cs
@@ -24,6 +24,8 @@
 using System.Text;
 using System.Net;
 
+using RestSharp.Extensions;
+
 namespace RestSharp
 {
 	public partial class RestClient
@@ -237,6 +239,10 @@ public virtual Task<T> ExecuteTaskAsync<T>(IRestRequest request, CancellationTok
 						{
 							taskCompletionSource.TrySetException(response.ErrorException);
 						}
+						else if (response.ResponseStatus != ResponseStatus.Completed)
+						{
+							taskCompletionSource.TrySetException(response.ResponseStatus.ToWebException());
+						}
 						else
 						{
 							taskCompletionSource.TrySetResult(response.Data);
@@ -327,6 +333,10 @@ public virtual Task<IRestResponse> ExecuteTaskAsync(IRestRequest request, Cancel
 						{
 							taskCompletionSource.TrySetException(response.ErrorException);
 						}
+						else if (response.ResponseStatus != ResponseStatus.Completed)
+						{
+							taskCompletionSource.TrySetException(response.ResponseStatus.ToWebException());
+						}
 						else
 						{
 							taskCompletionSource.TrySetResult(response);