Merge pull request #82 from ParsePlatform/richardross.httpclient.error

Fix several continuations inside of HttpClient.

Author: richardjrossiii

Parse/Internal/HttpClient.Android.cs

@@ -66,8 +66,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
         uploadTask = copyTask.Safe().ContinueWith(_ => {
           return request.GetRequestStreamAsync();
-        }).Unwrap()
-        .OnSuccess(t => {
+        }).Unwrap().OnSuccess(t => {
           var requestStream = t.Result;
 
           int bufferSize = 4096;
@@ -89,14 +88,14 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
             });
           }).ContinueWith(_ => {
             requestStream.Close();
-          });
+            return _;
+          }).Unwrap();
         }).Unwrap();
       }
 
-      return uploadTask.Safe().ContinueWith(_ => {
+      return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap()
-      .ContinueWith(t => {
+      }).Unwrap().OnSuccess(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 

Parse/Internal/HttpClient.NetFx45.cs

@@ -65,8 +65,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
         uploadTask = copyTask.Safe().ContinueWith(_ => {
           return request.GetRequestStreamAsync();
-        }).Unwrap()
-        .OnSuccess(t => {
+        }).Unwrap().OnSuccess(t => {
           var requestStream = t.Result;
 
           int bufferSize = 4096;
@@ -89,14 +88,14 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
           }).ContinueWith(_ => {
             //requestStream.Flush();
             requestStream.Dispose();
-          });
+            return _;
+          }).Unwrap();
         }).Unwrap();
       }
 
-      return uploadTask.Safe().ContinueWith(_ => {
+      return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap()
-      .ContinueWith(t => {
+      }).Unwrap().OnSuccess(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -147,7 +146,8 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
           });
         }).ContinueWith(_ => {
           responseStream.Dispose();
-
+          return _;
+        }).Unwrap().OnSuccess(_ => {
           // If getting stream size is not supported, then report download only once.
           if (totalLength == -1) {
             downloadProgress.Report(new ParseDownloadProgressEventArgs { Progress = 1.0 });

Parse/Internal/HttpClient.Phone.cs

@@ -94,7 +94,8 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
             });
           }).ContinueWith(_ => {
             requestStream.Close();
-          });
+            return _;
+          }).Unwrap();
         }).Unwrap();
       }
 

Parse/Internal/HttpClient.WinRT.cs

@@ -65,8 +65,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
         uploadTask = copyTask.Safe().ContinueWith(_ => {
           return request.GetRequestStreamAsync();
-        }).Unwrap()
-        .OnSuccess(t => {
+        }).Unwrap().OnSuccess(t => {
           var requestStream = t.Result;
 
           int bufferSize = 4096;
@@ -89,14 +88,14 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
           }).ContinueWith(_ => {
             //requestStream.Flush();
             requestStream.Dispose();
-          });
+            return _;
+          }).Unwrap();
         }).Unwrap();
       }
 
-      return uploadTask.Safe().ContinueWith(_ => {
+      return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap()
-      .ContinueWith(t => {
+      }).Unwrap().OnSuccess(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -147,7 +146,8 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
           });
         }).ContinueWith(_ => {
           responseStream.Dispose();
-
+          return _;
+        }).Unwrap().OnSuccess(_ => {
           // If getting stream size is not supported, then report download only once.
           if (totalLength == -1) {
             downloadProgress.Report(new ParseDownloadProgressEventArgs { Progress = 1.0 });

Parse/Internal/HttpClient.iOS.cs

@@ -67,8 +67,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
         uploadTask = copyTask.Safe().ContinueWith(_ => {
           return request.GetRequestStreamAsync();
-        }).Unwrap()
-        .OnSuccess(t => {
+        }).Unwrap().OnSuccess(t => {
           var requestStream = t.Result;
 
           int bufferSize = 4096;
@@ -90,14 +89,14 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
             });
           }).ContinueWith(_ => {
             requestStream.Close();
-          });
+            return _;
+          }).Unwrap();
         }).Unwrap();
       }
 
-      return uploadTask.Safe().ContinueWith(_ => {
+      return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap()
-      .ContinueWith(t => {
+      }).Unwrap().OnSuccess(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();