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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
This commit is contained in:
Sam Brannen
2023-05-23 11:29:10 +02:00
parent cba77c6909 fa85657801
commit d95ecbe0fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
View File

@@ -532,7 +532,7 @@ public class MockHttpServletRequestBuilder
/**
* Set the remote address of the request.
* @param remoteAddress the remote address (IP)
* @since 6.1
* @since 6.0.10
*/
public MockHttpServletRequestBuilder remoteAddress(String remoteAddress) {
Assert.hasText(remoteAddress, "'remoteAddress' must not be null or blank");