Skip to content

Commit bea89ce

Browse files
committed
Previous commit only fixed Request not RequestAsync's way of handling response headers
1 parent 7414f14 commit bea89ce

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Elasticsearch.Net/Connection/HttpConnection-CoreFx.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
7070
var response = client.SendAsync(requestMessage).GetAwaiter().GetResult();
7171
requestData.MadeItToResponse = true;
7272
builder.StatusCode = (int)response.StatusCode;
73-
builder.DeprecationWarnings = response.Headers.GetValues("Warning");
73+
IEnumerable<string> warnings;
74+
if (response.Headers.TryGetValues("Warning", out warnings))
75+
builder.DeprecationWarnings = warnings;
7476

7577
if (response.Content != null)
7678
builder.Stream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();

src/Elasticsearch.Net/Connection/HttpConnection.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
204204
var response = (HttpWebResponse)(await apmGetResponseTask.ConfigureAwait(false));
205205
builder.StatusCode = (int)response.StatusCode;
206206
builder.Stream = response.GetResponseStream();
207-
builder.DeprecationWarnings = response.Headers.GetValues("Warning");
207+
if (response.SupportsHeaders && response.Headers.HasKeys() && response.Headers.AllKeys.Contains("Warning"))
208+
builder.DeprecationWarnings = response.Headers.GetValues("Warning");
208209
// https://github.com/elastic/elasticsearch-net/issues/2311
209210
// if stream is null call dispose on response instead.
210211
if (builder.Stream == null || builder.Stream == Stream.Null) response.Dispose();

0 commit comments

Comments
 (0)