From 417a9d455965d3ce3eabf684c348ce1a1fd3b743 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Mon, 29 Aug 2016 15:13:25 +0200
Subject: [PATCH] Ensure correct array elements order in Jackson2JsonEncoder

Issue: SPR-14586
---
 .../springframework/http/codec/json/Jackson2JsonEncoder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
index 0b2c192373..5c97a4f97d 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonEncoder.java
@@ -96,7 +96,7 @@ public class Jackson2JsonEncoder extends AbstractJackson2Codec implements Encode
 		Mono<DataBuffer> endArray = Mono.just(bufferFactory.wrap(END_ARRAY_BUFFER));
 
 		Flux<DataBuffer> array = Flux.from(inputStream)
-				.flatMap(value -> {
+				.concatMap(value -> {
 					DataBuffer arraySeparator = bufferFactory.wrap(SEPARATOR_BUFFER);
 					return Flux.just(encodeValue(value, bufferFactory, elementType), arraySeparator);
 				});