From 9af42444710722709452182f03df6b5fb553f0ff Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 27 Sep 2010 15:55:39 -0400
Subject: [PATCH] INT-1481, final polishing

---
 .../http/HttpRequestExecutingMessageHandler.java           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
index c92324c479..a2cebab3a0 100755
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
@@ -288,13 +288,12 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 			contentType = MediaType.TEXT_XML;
 		}
 		else if (content instanceof Map){
-			Map multiValueMap = (Map) content;
 			/*
 			 * We need to check separately for MULTIPART as well as URLENCODED simply because
 			 * MultiValueMap<Object, Object> is actually valid content for serialization
 			 */
-			if (this.isFormData(multiValueMap)){
-				if (this.isMultipart(multiValueMap)){
+			if (this.isFormData((Map<Object, ?>) content)){
+				if (this.isMultipart((Map<String, ?>)content)){
 					contentType = MediaType.MULTIPART_FORM_DATA;
 				} 
 				else {
@@ -340,7 +339,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractReplyProducingMe
 		for (String key : map.keySet()) {
 			Object value = map.get(key);
 			if (value != null){
-				if (value instanceof Object[]){
+				if (value.getClass().isArray()){
 					value = CollectionUtils.arrayToList(value);	
 				}
 				if (value instanceof Collection){