From e88e8f1d094351a27d2aa758459d8dbf985eda5b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 16 Jan 2017 11:49:07 +0100 Subject: [PATCH] MockHttpServletRequestBuilder reliably detects form body content type again Issue: SPR-15116 --- .../request/MockHttpServletRequestBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index 944507ba181..9e5fede34bb 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java @@ -70,6 +70,7 @@ import org.springframework.web.util.UriUtils; * {@code MockHttpServletRequest} can be plugged in via {@link #with(RequestPostProcessor)}. * * @author Rossen Stoyanchev + * @author Juergen Hoeller * @author Arjen Poutsma * @author Sam Brannen * @author Kamill Sokol @@ -630,10 +631,13 @@ public class MockHttpServletRequestBuilder } } - if (this.content != null && this.contentType != null) { - MediaType mediaType = MediaType.parseMediaType(this.contentType); - if (MediaType.APPLICATION_FORM_URLENCODED.includes(mediaType)) { - addRequestParams(request, parseFormData(mediaType)); + if (this.content != null && this.content.length > 0) { + String requestContentType = request.getContentType(); + if (requestContentType != null) { + MediaType mediaType = MediaType.parseMediaType(requestContentType); + if (MediaType.APPLICATION_FORM_URLENCODED.includes(mediaType)) { + addRequestParams(request, parseFormData(mediaType)); + } } }