Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1481, final polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-09-27 15:55:39 -04:00
parent a10f547269
commit 9af4244471
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
View File

@@ -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){