include GetResponse() in using and inlined it so we can more aggresively cancel on the waithandles in the case of exceptions too

Author: Mpdreamz

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -189,9 +189,12 @@ private static void TimeoutCallback(object state, bool timedOut)
 			(state as WebRequest)?.Abort();
 		}
 
-		public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(RequestData requestData, CancellationToken cancellationToken) where TReturn : class
+		public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(RequestData requestData,
+			CancellationToken cancellationToken) where TReturn : class
 		{
 			var builder = new ResponseBuilder<TReturn>(requestData, cancellationToken);
+			WaitHandle apmWaitHandle = null;
+			RegisteredWaitHandle apmTaskTimeout = null;
 			try
 			{
 				var data = requestData.PostData;
@@ -201,39 +204,39 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
 					if (data != null)
 						await PostRequestAsync(requestData, cancellationToken, request, data);
 					requestData.MadeItToResponse = true;
+                    //http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
+                    //Either the stream or the response object needs to be closed but not both although it won't
+                    //throw any errors if both are closed atleast one of them has to be Closed.
+                    //Since we expose the stream we let closing the stream determining when to close the connection
+
+                    var apmGetResponseTask = Task.Factory.FromAsync(request.BeginGetResponse, request.EndGetResponse, null);
+                    apmWaitHandle = ((IAsyncResult) apmGetResponseTask).AsyncWaitHandle;
+                    apmTaskTimeout = RegisterApmTaskTimeout(apmGetResponseTask, request, requestData);
+
+                    var response = (HttpWebResponse) (await apmGetResponseTask.ConfigureAwait(false));
+                    builder.StatusCode = (int) response.StatusCode;
+                    builder.Stream = response.GetResponseStream();
+                    if (response.SupportsHeaders && response.Headers.HasKeys() && response.Headers.AllKeys.Contains("Warning"))
+                        builder.DeprecationWarnings = response.Headers.GetValues("Warning");
+                    // https://github.com/elastic/elasticsearch-net/issues/2311
+                    // if stream is null call dispose on response instead.
+                    if (builder.Stream == null || builder.Stream == Stream.Null) response.Dispose();
+                    if (apmWaitHandle != null) apmTaskTimeout?.Unregister(apmWaitHandle);
 				}
-				await GetResponseAsync(requestData, request, builder);
 			}
 			catch (WebException e)
 			{
+				if (apmWaitHandle != null) apmTaskTimeout?.Unregister(apmWaitHandle);
 				HandleException(builder, e);
 			}
-
+			catch
+			{
+				if (apmWaitHandle != null) apmTaskTimeout?.Unregister(apmWaitHandle);
+				throw;
+			}
 			return await builder.ToResponseAsync().ConfigureAwait(false);
 		}
 
-		private static async Task GetResponseAsync<TReturn>(RequestData requestData, HttpWebRequest request, ResponseBuilder<TReturn> builder)
-			where TReturn : class
-		{
-			//http://msdn.microsoft.com/en-us/library/system.net.httpwebresponse.getresponsestream.aspx
-			//Either the stream or the response object needs to be closed but not both although it won't
-			//throw any errors if both are closed atleast one of them has to be Closed.
-			//Since we expose the stream we let closing the stream determining when to close the connection
-
-			var apmGetResponseTask = Task.Factory.FromAsync(request.BeginGetResponse, request.EndGetResponse, null);
-			var getResponseCancellationHandle = RegisterApmTaskTimeout(apmGetResponseTask, request, requestData);
-
-			var response = (HttpWebResponse) (await apmGetResponseTask.ConfigureAwait(false));
-			builder.StatusCode = (int) response.StatusCode;
-			builder.Stream = response.GetResponseStream();
-			if (response.SupportsHeaders && response.Headers.HasKeys() && response.Headers.AllKeys.Contains("Warning"))
-				builder.DeprecationWarnings = response.Headers.GetValues("Warning");
-			// https://github.com/elastic/elasticsearch-net/issues/2311
-			// if stream is null call dispose on response instead.
-			if (builder.Stream == null || builder.Stream == Stream.Null) response.Dispose();
-			getResponseCancellationHandle.Unregister(((IAsyncResult) apmGetResponseTask).AsyncWaitHandle);
-		}
-
 		private static async Task PostRequestAsync(RequestData requestData, CancellationToken cancellationToken, HttpWebRequest request,
 			PostData<object> data)
 		{
@@ -256,14 +259,12 @@ private void HandleException<TReturn>(ResponseBuilder<TReturn> builder, WebExcep
 		{
 			builder.Exception = exception;
 			var response = exception.Response as HttpWebResponse;
-			if (response != null)
-			{
-				builder.StatusCode = (int)response.StatusCode;
-				builder.Stream = response.GetResponseStream();
-				// https://github.com/elastic/elasticsearch-net/issues/2311
-				// if stream is null call dispose on response instead.
-				if (builder.Stream == null || builder.Stream == Stream.Null) response.Dispose();
-			}
+			if (response == null) return;
+			builder.StatusCode = (int)response.StatusCode;
+			builder.Stream = response.GetResponseStream();
+			// https://github.com/elastic/elasticsearch-net/issues/2311
+			// if stream is null call dispose on response instead.
+			if (builder.Stream == null || builder.Stream == Stream.Null) response.Dispose();
 		}
 
 		void IDisposable.Dispose() => this.DisposeManagedResources();