Merge pull request #335 from box/conflict-exp

Handle the UploadFile conflict exception correctly
box · May 17, 2017 · ef473d0 · ef473d0
2 parents d545d18 + 0fc29bc
commit ef473d0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Box.V2/Extensions/BoxResponseExtensions.cs b/Box.V2/Extensions/BoxResponseExtensions.cs
@@ -58,11 +58,12 @@ public static IBoxResponse<T> ParseResults<T>(this IBoxResponse<T> response, IBo
                             switch (response.StatusCode)
                             {
                                 case System.Net.HttpStatusCode.Conflict:
-                                    if (response is IBoxResponse<BoxPreflightCheck>)
+                                    if (response is IBoxResponse<BoxPreflightCheck> || response is IBoxResponse<BoxCollection<BoxFile>>)
                                     {
                                         BoxPreflightCheckConflictError<BoxFile> err = converter.Parse<BoxPreflightCheckConflictError<BoxFile>>(response.ContentString);
                                         exToThrow = new BoxPreflightCheckConflictException<BoxFile>(response.ContentString, err) { StatusCode = response.StatusCode, ResponseHeaders = response.Headers };
-                                    } else
+                                    }
+                                    else
                                     {
                                         BoxConflictError<T> error = converter.Parse<BoxConflictError<T>>(response.ContentString);
                                         exToThrow = new BoxConflictException<T>(response.ContentString, error) { StatusCode = response.StatusCode, ResponseHeaders = response.Headers };