From b94e8c4bef90c78231063ad2c6f5bec8fc11b899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=AF=97=E5=B3=A3?= <wangshiyao@wangshiyao.com>
Date: Tue, 8 Jan 2019 13:57:56 +0800
Subject: [PATCH] Fix ClassCastException in FormHttpMessageConverter

We should not cast MultiValueMap<String, ?> to MultiValueMap<String, String>
---
 .../http/converter/FormHttpMessageConverter.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index eb4909015ff..6cf56b2587f 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -270,7 +270,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 			throws IOException, HttpMessageNotWritableException {
 
 		if (!isMultipart(map, contentType)) {
-			writeForm((MultiValueMap<String, String>) map, contentType, outputMessage);
+			writeForm((MultiValueMap<String, Object>) map, contentType, outputMessage);
 		}
 		else {
 			writeMultipart((MultiValueMap<String, Object>) map, outputMessage);
@@ -292,7 +292,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		return false;
 	}
 
-	private void writeForm(MultiValueMap<String, String> formData, @Nullable MediaType contentType,
+	private void writeForm(MultiValueMap<String, Object> formData, @Nullable MediaType contentType,
 			HttpOutputMessage outputMessage) throws IOException {
 
 		contentType = getMediaType(contentType);
@@ -325,7 +325,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		}
 	}
 
-	protected String serializeForm(MultiValueMap<String, String> formData, Charset charset) {
+	protected String serializeForm(MultiValueMap<String, Object> formData, Charset charset) {
 		StringBuilder builder = new StringBuilder();
 		formData.forEach((name, values) ->
 				values.forEach(value -> {
@@ -336,7 +336,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 						builder.append(URLEncoder.encode(name, charset.name()));
 						if (value != null) {
 							builder.append('=');
-							builder.append(URLEncoder.encode(value, charset.name()));
+							builder.append(URLEncoder.encode(String.valueOf(value), charset.name()));
 						}
 					}
 					catch (UnsupportedEncodingException ex) {