Use HttpMessageHandler

Fixes #3415
elastic · Apr 8, 2019 · 32e2b5c · 32e2b5c
1 parent 068ba99
commit 32e2b5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Elasticsearch.Net/Connection/HttpConnection.cs b/src/Elasticsearch.Net/Connection/HttpConnection.cs
@@ -74,7 +74,7 @@ public virtual TResponse Request<TResponse>(RequestData requestData)
 			}
 			responseStream = responseStream ?? Stream.Null;
 			var response = ResponseBuilder.ToResponse<TResponse>(requestData, ex, statusCode, warnings, responseStream, mimeType);
-			//var response = builder.ToResponse();
+
 			//explicit dispose of response not needed (as documented on MSDN) on desktop CLR
 			//but we can not guarantee this is true for all HttpMessageHandler implementations
 			if (typeof(TResponse) != typeof(ElasticsearchResponse<Stream>)) responseMessage?.Dispose();
@@ -150,7 +150,7 @@ private HttpClient GetClient(RequestData requestData)
 			return client;
 		}
 
-		protected virtual HttpClientHandler CreateHttpClientHandler(RequestData requestData)
+		protected virtual HttpMessageHandler CreateHttpClientHandler(RequestData requestData)
 		{
 			var handler = new HttpClientHandler
 			{

diff --git a/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs b/src/Tests/Tests/ClientConcepts/Connection/HttpConnectionTests.cs
@@ -127,9 +127,9 @@ public override Task<TResponse> RequestAsync<TResponse>(RequestData requestData,
 				return base.RequestAsync<TResponse>(requestData, cancellationToken);
 			}
 
-			protected override HttpClientHandler CreateHttpClientHandler(RequestData requestData)
+			protected override HttpMessageHandler CreateHttpClientHandler(RequestData requestData)
 			{
-				LastUsedHttpClientHandler = base.CreateHttpClientHandler(requestData);
+				LastUsedHttpClientHandler = (HttpClientHandler)base.CreateHttpClientHandler(requestData);
 				return LastUsedHttpClientHandler;
 			}
 		}