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

Handle empty file input in HtmlUnitRequestBuilder

Browse Source 
Prior to this commit, when using HtmlUnit with empty file input,
MockMvc's HtmlUnitRequestBuilder would throw a NullPointerException
when attempting to create a MockPart based on the null File.

This commit ensures that empty file input is converted to a MockPart
with a valid name but with a null filename, a null content type, and
empty content.

Closes gh-26799
This commit is contained in:
Sam Brannen
2021-05-05 18:07:23 +02:00
parent 38b592444d
commit 959e6d1745
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -373,8 +373,13 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
for (NameValuePair param : this.webRequest.getRequestParameters()) {
if (param instanceof KeyDataPair) {
KeyDataPair pair = (KeyDataPair) param;
MockPart part = new MockPart(pair.getName(), pair.getFile().getName(), readAllBytes(pair.getFile()));
part.getHeaders().setContentType(MediaType.valueOf(pair.getMimeType()));
File file = pair.getFile();
MockPart part = (file != null ?
new MockPart(pair.getName(), file.getName(), readAllBytes(file)) :
new MockPart(pair.getName(), null));
if (StringUtils.hasLength(pair.getMimeType())) {
part.getHeaders().setContentType(MediaType.valueOf(pair.getMimeType()));
}
request.addPart(part);
}
else {