fix: properly dispose response on exception (#819)

box · May 4, 2022 · 8415bd3 · 8415bd3
1 parent 73792a5
commit 8415bd3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Box.V2/Request/HttpRequestHandler.cs b/Box.V2/Request/HttpRequestHandler.cs
@@ -33,6 +33,7 @@ public async Task<IBoxResponse<T>> ExecuteAsyncWithoutRetry<T>(IBoxRequest reque
         {
             // Need to account for special cases when the return type is a stream
             var isStream = typeof(T) == typeof(Stream);
+            HttpResponseMessage response = null;
 
             try
             {
@@ -42,13 +43,14 @@ public async Task<IBoxResponse<T>> ExecuteAsyncWithoutRetry<T>(IBoxRequest reque
 
                 HttpRequestMessage httpRequest = GetHttpRequest(request, isMultiPartRequest, isBinaryRequest);
                 Debug.WriteLine(string.Format("RequestUri: {0}", httpRequest.RequestUri));
-                HttpResponseMessage response = await GetResponse(request, isStream, httpRequest).ConfigureAwait(false);
+                response = await GetResponse(request, isStream, httpRequest).ConfigureAwait(false);
                 BoxResponse<T> boxResponse = await GetBoxResponse<T>(isStream, response).ConfigureAwait(false);
 
                 return boxResponse;
             }
             catch (Exception ex)
             {
+                response?.Dispose();
                 Debug.WriteLine(string.Format("Exception: {0}", ex.Message));
                 throw;
             }
@@ -61,6 +63,7 @@ public async Task<IBoxResponse<T>> ExecuteAsync<T>(IBoxRequest request)
             var isStream = typeof(T) == typeof(Stream);
             var retryCounter = 0;
             var expBackoff = new ExponentialBackoff();
+            HttpResponseMessage response = null;
 
             try
             {
@@ -73,7 +76,7 @@ public async Task<IBoxResponse<T>> ExecuteAsync<T>(IBoxRequest request)
                     using (HttpRequestMessage httpRequest = GetHttpRequest(request, isMultiPartRequest, isBinaryRequest))
                     {
                         Debug.WriteLine(string.Format("RequestUri: {0}", httpRequest.RequestUri));
-                        HttpResponseMessage response = await GetResponse(request, isStream, httpRequest).ConfigureAwait(false);
+                        response = await GetResponse(request, isStream, httpRequest).ConfigureAwait(false);
                         //need to wait for Retry-After seconds and then retry request
                         var retryAfterHeader = response.Headers.RetryAfter;
 
@@ -94,6 +97,7 @@ public async Task<IBoxResponse<T>> ExecuteAsync<T>(IBoxRequest request)
                             (response.StatusCode == HttpStatusCode.Accepted && retryAfterHeader != null))
                             && retryCounter++ < RetryLimit)
                         {
+                            response?.Dispose();
                             TimeSpan delay = expBackoff.GetRetryTimeout(retryCounter);
 
                             Debug.WriteLine("HttpCode : {0}. Waiting for {1} seconds to retry request. RequestUri: {2}", response.StatusCode, delay.Seconds, httpRequest.RequestUri);
@@ -111,6 +115,7 @@ public async Task<IBoxResponse<T>> ExecuteAsync<T>(IBoxRequest request)
             }
             catch (Exception ex)
             {
+                response?.Dispose();
                 Debug.WriteLine(string.Format("Exception: {0}", ex.Message));
                 throw;
             }