Merge pull request Kong#131 from orlingueorguievivu/patch-1

shashiranjan84 · shashiranjan84 · commit f37caf93ad32 · 2016-02-03T15:04:08.000-08:00
Potential fix for Kong#87
diff --git a/src/main/java/com/mashape/unirest/request/body/MultipartBody.java b/src/main/java/com/mashape/unirest/request/body/MultipartBody.java
@@ -34,6 +34,7 @@ a copy of this software and associated documentation files (the
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.LinkedHashMap;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -51,9 +52,7 @@ a copy of this software and associated documentation files (the
 import com.mashape.unirest.request.HttpRequest;
 
 public class MultipartBody extends BaseRequest implements Body {
-
-	private List<String> keyOrder = new ArrayList<String>();
-	private Map<String, List<Object>> parameters = new HashMap<String, List<Object>>();
+	private Map<String, List<Object>> parameters = new LinkedHashMap<String, List<Object>>();
 	private Map<String, ContentType> contentTypes = new HashMap<String, ContentType>();
 
 	private boolean hasFile;
@@ -90,8 +89,6 @@ public MultipartBody field(String name, Object value, boolean file) {
 	}
 
 	public MultipartBody field(String name, Object value, boolean file, String contentType) {
-		keyOrder.add(name);
-
 		List<Object> list = parameters.get(name);
 		if (list == null)
 			list = new LinkedList<Object>();
@@ -155,7 +152,7 @@ public HttpEntity getEntity() {
 			if (mode != null) {
 				builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
 			}
-			for (String key : keyOrder) {
+			for (String key : parameters.keySet()) {
 				List<Object> value = parameters.get(key);
 				ContentType contentType = contentTypes.get(key);
 				for (Object cur : value) {
