From c67c213fd23ca2e38569cdfefb6d7a75772e1803 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Tue, 16 Sep 2014 16:30:42 +0200 Subject: [PATCH] HttpClientConnection (alternative for the builtin) had a NRE causing it to misbehave --- .../HttpClientConnection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs b/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs index f9c7855a969..d5e5b876967 100644 --- a/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs +++ b/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs @@ -126,8 +126,6 @@ public async Task> DoRequest(HttpMethod method, Ur else if (!string.IsNullOrWhiteSpace(DefaultContentType)) request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType)); - if (!string.IsNullOrWhiteSpace(DefaultContentType)) - request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType); if (!string.IsNullOrEmpty(uri.UserInfo)) { @@ -137,6 +135,8 @@ public async Task> DoRequest(HttpMethod method, Ur if (method != HttpMethod.Get && method != HttpMethod.Head && data != null && data.Length > 0) { request.Content = new ByteArrayContent(data); + if (!string.IsNullOrWhiteSpace(DefaultContentType) && request.Content != null && request.Content.Headers != null) + request.Content.Headers.ContentType = new MediaTypeHeaderValue(DefaultContentType); } var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);