fixed aggregate exceptions bubling out as suppose to maxretryexceptions

Author: Mpdreamz

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandler.cs

@@ -65,7 +65,10 @@ private ElasticsearchResponse<T> ReturnStreamOrVoidResponse<T>(
 		{
 			// If the response never recieved a status code and has a caught exception make sure we throw it
 			if (streamResponse.HttpStatusCode.GetValueOrDefault(-1) <= 0 && streamResponse.OriginalException != null)
-				throw streamResponse.OriginalException;
+			{
+				streamResponse.OriginalException.RethrowKeepingStackTrace();
+				return null; //wont be hit
+			}
 
 			// If the user explicitly wants a stream returned the undisposed stream
 			if (typeof(Stream).IsAssignableFrom(typeof(T)))

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerAsync.cs

@@ -205,7 +205,7 @@ private Task<ElasticsearchResponse<T>> HandleStreamResponse<T>(Task<Elasticsearc
 			//If we are not using any pooling and we see an exception we rethrow
 			if (!requestState.UsingPooling && t.IsFaulted && t.Exception != null && maxRetries == 0)
 			{
-				t.Exception.RethrowKeepingStackTrace();
+				t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
 				return null; //won't be hit
 			}
 

src/Elasticsearch.Net/Connection/RequestHandlers/RequestHandlerBase.cs

@@ -141,7 +141,10 @@ protected void ThrowMaxRetryExceptionWhenNeeded<T>(TransportRequestState<T> requ
 
 			//When we are not using pooling we forcefully rethrow the exception
 			if (!requestState.UsingPooling && innerException != null && maxRetries == 0)
-				throw innerException;
+			{
+				innerException.RethrowKeepingStackTrace();
+				return;
+			}
 
 			var exceptionMessage = tookToLong 
 				? CreateTookTooLongExceptionMessage(requestState, innerException) 

src/Elasticsearch.Net/Connection/Transport.cs

@@ -201,9 +201,9 @@ IList<Uri> ITransportDelegator.Sniff(ITransportRequestState ownerState = null)
 					using (response.Response)
 					{
 						return Sniffer.FromStream(
-							response, 
-							response.Response, 
-							this.Serializer, 
+							response,
+							response.Response,
+							this.Serializer,
 							this.Connection.AddressScheme
 						);
 					}
@@ -265,7 +265,7 @@ bool ITransportDelegator.TookTooLongToRetry(ITransportRequestState requestState)
 			var timeout = this.Settings.MaxRetryTimeout.GetValueOrDefault(TimeSpan.FromMilliseconds(this.Settings.Timeout));
 			var startedOn = requestState.StartedOn;
 			var now = this._dateTimeProvider.Now();
-			
+
 			//we apply a soft margin so that if a request timesout at 59 seconds when the maximum is 60
 			//we also abort.
 			var margin = (timeout.TotalMilliseconds / 100.0) * 98;
@@ -348,7 +348,17 @@ public Task<ElasticsearchResponse<T>> DoRequestAsync<T>(string method, string pa
 		{
 			using (var requestState = new TransportRequestState<T>(this.Settings, requestParameters, method, path))
 			{
-				return this._requestHandlerAsync.RequestAsync(requestState, data);
+				return this._requestHandlerAsync.RequestAsync(requestState, data)
+					.ContinueWith<ElasticsearchResponse<T>>(t =>
+					{
+						if (t.IsFaulted && t.Exception != null)
+						{
+							t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+							return null; //won't be hit
+						}
+
+						return t.Result;
+					});
 			}
 		}
 	}