@@ -66,8 +66,8 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
66
66
{
67
67
//TODO remove Stream response support in 6.0, closing the stream is sufficient on desktop/mono
68
68
//but not on .NET core on linux HttpClient which proxies to curl.
69
- if ( typeof ( TReturn ) == typeof ( Stream ) && ConnectionConfiguration . IsCurlHandler )
70
- throw new Exception ( CanNotUseStreamResponsesWithCurlHandler ) ;
69
+ if ( typeof ( TReturn ) == typeof ( Stream ) && ConnectionConfiguration . IsCurlHandler )
70
+ throw new Exception ( CanNotUseStreamResponsesWithCurlHandler ) ;
71
71
72
72
var client = this . GetClient ( requestData ) ;
73
73
var builder = new ResponseBuilder < TReturn > ( requestData ) ;
@@ -77,7 +77,7 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
77
77
var requestMessage = CreateHttpRequestMessage ( requestData ) ;
78
78
responseMessage = client . SendAsync ( requestMessage ) . GetAwaiter ( ) . GetResult ( ) ;
79
79
requestData . MadeItToResponse = true ;
80
- builder . StatusCode = ( int ) responseMessage . StatusCode ;
80
+ builder . StatusCode = ( int ) responseMessage . StatusCode ;
81
81
IEnumerable < string > warnings ;
82
82
if ( responseMessage . Headers . TryGetValues ( "Warning" , out warnings ) )
83
83
builder . DeprecationWarnings = warnings ;
@@ -96,20 +96,21 @@ public virtual ElasticsearchResponse<TReturn> Request<TReturn>(RequestData reque
96
96
{
97
97
builder . Exception = e ;
98
98
}
99
- var response = builder . ToResponse ( ) ;
99
+ var response = builder . ToResponse ( ) ;
100
100
//explicit dispose of response not needed (as documented on MSDN) on desktop CLR
101
101
//but we can not guarantee this is true for all HttpMessageHandler implementations
102
- if ( typeof ( TReturn ) != typeof ( Stream ) ) responseMessage ? . Dispose ( ) ;
103
- return response ;
102
+ if ( typeof ( TReturn ) != typeof ( Stream ) ) responseMessage ? . Dispose ( ) ;
103
+ return response ;
104
104
}
105
105
106
106
107
- public virtual async Task < ElasticsearchResponse < TReturn > > RequestAsync < TReturn > ( RequestData requestData , CancellationToken cancellationToken ) where TReturn : class
107
+ public virtual async Task < ElasticsearchResponse < TReturn > > RequestAsync < TReturn > ( RequestData requestData ,
108
+ CancellationToken cancellationToken ) where TReturn : class
108
109
{
109
110
//TODO remove Stream response support in 6.0, closing the stream is sufficient on desktop/mono
110
111
//but not on .NET core on linux HttpClient which proxies to curl.
111
- if ( typeof ( TReturn ) == typeof ( Stream ) && ConnectionConfiguration . IsCurlHandler )
112
- throw new Exception ( CanNotUseStreamResponsesWithCurlHandler ) ;
112
+ if ( typeof ( TReturn ) == typeof ( Stream ) && ConnectionConfiguration . IsCurlHandler )
113
+ throw new Exception ( CanNotUseStreamResponsesWithCurlHandler ) ;
113
114
114
115
var client = this . GetClient ( requestData ) ;
115
116
var builder = new ResponseBuilder < TReturn > ( requestData , cancellationToken ) ;
@@ -118,7 +119,8 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
118
119
{
119
120
var requestMessage = CreateHttpRequestMessage ( requestData ) ;
120
121
responseMessage = await client . SendAsync ( requestMessage , cancellationToken ) . ConfigureAwait ( false ) ;
121
- builder . StatusCode = ( int ) responseMessage . StatusCode ;
122
+ requestData . MadeItToResponse = true ;
123
+ builder . StatusCode = ( int ) responseMessage . StatusCode ;
122
124
IEnumerable < string > warnings ;
123
125
if ( responseMessage . Headers . TryGetValues ( "Warning" , out warnings ) )
124
126
builder . DeprecationWarnings = warnings ;
@@ -137,11 +139,11 @@ public virtual async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(
137
139
{
138
140
builder . Exception = e ;
139
141
}
140
- var response = await builder . ToResponseAsync ( ) . ConfigureAwait ( false ) ;
142
+ var response = await builder . ToResponseAsync ( ) . ConfigureAwait ( false ) ;
141
143
//explicit dispose of response not needed (as documented on MSDN) on desktop CLR
142
144
//but we can not guarantee this is true for all HttpMessageHandler implementations
143
- if ( typeof ( TReturn ) != typeof ( Stream ) ) responseMessage ? . Dispose ( ) ;
144
- return response ;
145
+ if ( typeof ( TReturn ) != typeof ( Stream ) ) responseMessage ? . Dispose ( ) ;
146
+ return response ;
145
147
}
146
148
147
149
private static readonly string MissingConnectionLimitMethodError =
@@ -179,8 +181,8 @@ protected virtual HttpClientHandler CreateHttpClientHandler(RequestData requestD
179
181
var proxy = new WebProxy ( uri ) ;
180
182
if ( ! string . IsNullOrEmpty ( requestData . ProxyUsername ) )
181
183
{
182
- var credentials = new NetworkCredential ( requestData . ProxyUsername , requestData . ProxyPassword ) ;
183
- proxy . Credentials = credentials ;
184
+ var credentials = new NetworkCredential ( requestData . ProxyUsername , requestData . ProxyPassword ) ;
185
+ proxy . Credentials = credentials ;
184
186
}
185
187
handler . Proxy = proxy ;
186
188
}
0 commit comments