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

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2019-06-29 00:12:43 +03:00
parent 5a308ad5bd
commit 75d1428e24
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
View File

@@ -376,7 +376,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
Charset charset = contentType.getCharset(); Charset charset = contentType.getCharset();
Assert.notNull(charset, "No charset"); // should never occur Assert.notNull(charset, "No charset"); // should never occur
final byte[] bytes = serializeForm(formData, charset).getBytes(charset); byte[] bytes = serializeForm(formData, charset).getBytes(charset);
outputMessage.getHeaders().setContentLength(bytes.length); outputMessage.getHeaders().setContentLength(bytes.length);
if (outputMessage instanceof StreamingHttpOutputMessage) { if (outputMessage instanceof StreamingHttpOutputMessage) {
@@ -422,17 +422,17 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
return builder.toString(); return builder.toString();
} }
private void writeMultipart(final MultiValueMap<String, Object> parts, MediaType contentType, HttpOutputMessage outputMessage) private void writeMultipart(MultiValueMap<String, Object> parts, MediaType contentType, HttpOutputMessage outputMessage)
throws IOException { throws IOException {
// If the supplied content type is null, fall back to multipart/form-data. // If the supplied content type is null, fall back to multipart/form-data.
// Otherwise rely on the fact that isMultipart() already verified the // Otherwise rely on the fact that isMultipart() already verified the
// supplied content type is multipart/*. // supplied content type is multipart.
if (contentType == null) { if (contentType == null) {
contentType = MediaType.MULTIPART_FORM_DATA; contentType = MediaType.MULTIPART_FORM_DATA;
} }
final byte[] boundary = generateMultipartBoundary(); byte[] boundary = generateMultipartBoundary();
Map<String, String> parameters = new LinkedHashMap<>(2); Map<String, String> parameters = new LinkedHashMap<>(2);
if (!isFilenameCharsetSet()) { if (!isFilenameCharsetSet()) {
parameters.put("charset", this.charset.name()); parameters.put("charset", this.charset.name());