Skip to content

Commit b1267b9

Browse files
committed
Fix NPE in FormHttpMessageConverter
Issue: SPR-10187
1 parent a316163 commit b1267b9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

org.springframework.web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,12 @@ private void writeParts(OutputStream os, MultiValueMap<String, Object> parts, by
265265
for (Map.Entry<String, List<Object>> entry : parts.entrySet()) {
266266
String name = entry.getKey();
267267
for (Object part : entry.getValue()) {
268-
writeBoundary(boundary, os);
269-
HttpEntity entity = getEntity(part);
270-
writePart(name, entity, os);
271-
writeNewLine(os);
268+
if (part != null) {
269+
writeBoundary(boundary, os);
270+
HttpEntity entity = getEntity(part);
271+
writePart(name, entity, os);
272+
writeNewLine(os);
273+
}
272274
}
273275
}
274276
}

org.springframework.web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public void writeMultipart() throws Exception {
112112
parts.add("name 1", "value 1");
113113
parts.add("name 2", "value 2+1");
114114
parts.add("name 2", "value 2+2");
115+
parts.add("name 3", null);
115116

116117
Resource logo = new ClassPathResource("/org/springframework/http/converter/logo.jpg");
117118
parts.add("logo", logo);

0 commit comments

Comments
 (0)