Handle empty error responses in media upload/download

Fixes issue #692.
googleapis · Mar 7, 2016 · 8c179aa · 8c179aa
1 parent f646ef3
commit 8c179aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs b/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs
@@ -314,11 +314,12 @@ public void Download_Error_JsonResponse()
         }
 
         [Test]
-        public void Download_Error_PlaintextResponse()
+        [TestCase("Not Found")]
+        [TestCase("")]
+        public void Download_Error_PlaintextResponse(string responseText)
         {
             var downloadUri = "http://www.sample.com";
             var chunkSize = 100;
-            var responseText = "Not Found";
 
             var handler = new MultipleChunksMessageHandler { ErrorResponse = responseText };
             handler.StatusCode = HttpStatusCode.NotFound;

diff --git a/Src/Support/GoogleApis/Apis/[Media]/MediaApiErrorHandling.cs b/Src/Support/GoogleApis/Apis/[Media]/MediaApiErrorHandling.cs
@@ -45,10 +45,10 @@ internal static async Task<GoogleApiException> ExceptionForResponseAsync(
             string message = responseText;
             try
             {
-                parsedError = service.Serializer.Deserialize<StandardResponse<object>>(responseText).Error;
-                if (parsedError != null)
+                var parsedResponse = service.Serializer.Deserialize<StandardResponse<object>>(responseText);
+                if (parsedResponse != null && parsedResponse.Error != null)
                 {
-                    message = parsedError.ToString();
+                    message = parsedResponse.Error.ToString();
                 }
             }
             catch (JsonException)