Fix #1856 respect DisableDirectStreaming setting on error responses

Author: gmarz

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

@@ -54,17 +54,17 @@ private ElasticsearchResponse<TReturn> Initialize(int? statusCode, Exception exc
 		}
 
 		private void SetBody(ElasticsearchResponse<TReturn> response, Stream stream)
-		{
+		{
+			byte[] bytes = null;
+			if (NeedsToEagerReadStream())
+			{
+				var inMemoryStream = this._requestData.MemoryStreamFactory.Create();
+				stream.CopyTo(inMemoryStream, BufferSize);
+				bytes = this.SwapStreams(ref stream, ref inMemoryStream);
+			}
+
 			if (response.Success)
 			{
-				byte[] bytes = null;
-				if (NeedsToEagerReadStream())
-				{
-					var inMemoryStream = this._requestData.MemoryStreamFactory.Create();
-					stream.CopyTo(inMemoryStream, BufferSize);
-					bytes = this.SwapStreams(ref stream, ref inMemoryStream);
-				}
-
 				if (!SetSpecialTypes(stream, response, bytes))
 				{
 					if (this._requestData.CustomConverter != null) response.Body = this._requestData.CustomConverter(response, stream) as TReturn;
@@ -76,21 +76,23 @@ private void SetBody(ElasticsearchResponse<TReturn> response, Stream stream)
 				ServerError serverError;
 				if (ServerError.TryCreate(stream, out serverError))
 					response.ServerError = serverError;
+				if (this._requestData.ConnectionSettings.DisableDirectStreaming)
+					response.ResponseBodyInBytes = bytes;
 			}
 		}
 
 		private async Task SetBodyAsync(ElasticsearchResponse<TReturn> response, Stream stream)
-		{
+		{
+			byte[] bytes = null;
+			if (NeedsToEagerReadStream())
+			{
+				var inMemoryStream = this._requestData.MemoryStreamFactory.Create();
+				await stream.CopyToAsync(inMemoryStream, BufferSize, this._requestData.CancellationToken).ConfigureAwait(false);
+				bytes = this.SwapStreams(ref stream, ref inMemoryStream);
+			}
+
 			if (response.Success)
 			{
-				byte[] bytes = null;
-				if (NeedsToEagerReadStream())
-				{
-					var inMemoryStream = this._requestData.MemoryStreamFactory.Create();
-					await stream.CopyToAsync(inMemoryStream, BufferSize, this._requestData.CancellationToken).ConfigureAwait(false);
-					bytes = this.SwapStreams(ref stream, ref inMemoryStream);
-				}
-
 				if (!SetSpecialTypes(stream, response, bytes))
 				{
 					if (this._requestData.CustomConverter != null) response.Body = this._requestData.CustomConverter(response, stream) as TReturn;
@@ -100,6 +102,8 @@ private async Task SetBodyAsync(ElasticsearchResponse<TReturn> response, Stream
 			else if (response.HttpStatusCode != null)
 			{
 				response.ServerError = await ServerError.TryCreateAsync(stream, this._requestData.CancellationToken).ConfigureAwait(false);
+				if (this._requestData.ConnectionSettings.DisableDirectStreaming)
+					response.ResponseBodyInBytes = bytes;
 			}
 		}
 

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running