Skip to content

Commit 236ef25

Browse files
committed
Merge pull request #1887 from rossbrower/master
Fix handling of return types.
2 parents 129e899 + fa11aa0 commit 236ef25

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ private bool SetSpecialTypes(Stream responseStream, ElasticsearchResponse<TRetur
130130
var setSpecial = true;
131131
if (this._requestData.ConnectionSettings.DisableDirectStreaming)
132132
cs.ResponseBodyInBytes = bytes;
133-
134-
if (cs.Body is string)
133+
var returnType = typeof (TReturn);
134+
if (returnType == typeof(string))
135135
this.SetStringResult(cs as ElasticsearchResponse<string>, bytes);
136-
else if (cs.Body is byte[])
136+
else if (returnType == typeof(byte[]))
137137
this.SetByteResult(cs as ElasticsearchResponse<byte[]>, bytes);
138-
else if (cs.Body is VoidResponse)
138+
else if (returnType == typeof(VoidResponse))
139139
this.SetVoidResult(cs as ElasticsearchResponse<VoidResponse>, responseStream);
140-
else if (cs.Body is Stream)
141-
this.SetStreamResult(cs as ElasticsearchResponse<Stream>, responseStream);
140+
else if (returnType == typeof(Stream))
141+
this.SetStreamResult(cs as ElasticsearchResponse<Stream>, responseStream);
142142
else
143143
setSpecial = false;
144144
return setSpecial;

0 commit comments

Comments
 (0)