HttpClientConnection (alternative for the builtin) had a NRE causing …

…it to misbehave
elastic · Sep 16, 2014 · c67c213 · c67c213
1 parent ed92427
commit c67c213
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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<ElasticsearchResponse<Stream>> 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<ElasticsearchResponse<Stream>> 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);