added RethrowKeepingStackTrace to all instance where throw ex; was necessary, add explicit returns everywhere we call RethrowKeepingStackTrace, won't be hit but helps code analysis

Author: Mpdreamz

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

@@ -158,20 +158,17 @@ private ElasticsearchResponse<T> DoRequest<T>(TransportRequestState<T> requestSt
 			}
 			catch (MaxRetryException)
 			{
-				//TODO ifdef ExceptionDispatchInfo.Capture(ex).Throw();
 				throw;
 			}
 			catch (ElasticsearchServerException)
 			{
-				//TODO ifdef ExceptionDispatchInfo.Capture(ex).Throw();
 				throw;
 			}
 			catch (Exception e)
 			{
 				requestState.SeenExceptions.Add(e);
 				if (maxRetries == 0 && retried == 0)
 				{
-					//TODO ifdef ExceptionDispatchInfo.Capture(ex).Throw();
 					throw;
 				}
 				seenError = true;

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

@@ -204,8 +204,10 @@ 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();
-
+				return null; //won't be hit
+			}
 
 			var retried = requestState.Retried;
 
@@ -215,7 +217,10 @@ private Task<ElasticsearchResponse<T>> HandleStreamResponse<T>(Task<Elasticsearc
 
 			// 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)
+			{
 				streamResponse.OriginalException.RethrowKeepingStackTrace();
+				return null; //won't be hit
+			}
 
 			// If the user explicitly wants a stream return the undisposed stream
 			if (typeof(Stream).IsAssignableFrom(typeof(T)))

src/Elasticsearch.Net/Domain/Response/ElasticsearchResponse.cs

@@ -29,8 +29,10 @@ public static Task<ElasticsearchResponse<DynamicDictionary>> WrapAsync(Task<Elas
 				.ContinueWith(t =>
 				{
 					if (t.IsFaulted && t.Exception != null)
-						throw t.Exception.Flatten().InnerException;
-
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 					return ToDynamicResponse(t.Result);
 				});
 		}

src/Elasticsearch.Net/Extensions/ExceptionExtensions.cs

@@ -13,6 +13,7 @@ public static void RethrowKeepingStackTrace(this Exception exception)
 		{
 			// In .Net 4.5 it would be simple : ExceptionDispatchInfo.Capture(exception).Throw();
 			// But as NEST target .Net 4.0 the old internal method must be used
+			//TODO NEST 2.0 Use ifdef NET45 to call	ExceptionDispatchInfo.Capture(exception).Throw();
 			if (preserveStackTraceMethodInfo.Value != null)
 			{
 				preserveStackTraceMethodInfo.Value.Invoke(exception, null);

src/Nest/ElasticClient-Source.cs

@@ -33,7 +33,11 @@ public Task<T> SourceAsync<T>(Func<SourceDescriptor<T>, SourceDescriptor<T>> get
 			var response = this.RawDispatch.GetSourceDispatchAsync<T>(pathInfo)
 				.ContinueWith(t =>
 				{
-					if (t.IsFaulted) throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null)
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 					return t.Result.Response;
 				});
 			return response;
@@ -46,7 +50,11 @@ public Task<T> SourceAsync<T>(ISourceRequest sourceRequest) where T : class
 			var response = this.RawDispatch.GetSourceDispatchAsync<T>(pathInfo)
 				.ContinueWith(t =>
 				{
-					if (t.IsFaulted) throw t.Exception.Flatten().InnerException;
+					if (t.IsFaulted && t.Exception != null) 
+					{
+						t.Exception.Flatten().InnerException.RethrowKeepingStackTrace();
+						return null; //won't be hit
+					}
 					return t.Result.Response;
 				});
 			return response;

src/Nest/Extensions/ExceptionExtensions.cs

@@ -13,6 +13,7 @@ public static void RethrowKeepingStackTrace(this Exception exception)
         {
             // In .Net 4.5 it would be simple : ExceptionDispatchInfo.Capture(exception).Throw();
             // But as NEST target .Net 4.0 the old internal method must be used
+			//TODO NEST 2.0 Use ifdef NET45 to call	ExceptionDispatchInfo.Capture(exception).Throw();
             if (preserveStackTraceMethodInfo.Value != null)
             {
                 preserveStackTraceMethodInfo.Value.Invoke(exception, null);