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

ServletRequestMethodArgumentResolver passes null references through (again)

Browse Source 
Issue: SPR-15214
This commit is contained in:
Juergen Hoeller
2017-02-20 23:00:07 +01:00
parent b3ad4229f5
commit fc11321010
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
View File

@@ -62,7 +62,7 @@ public class ServletRequestMethodArgumentResolverTests {
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
method = getClass().getMethod("supportedParams", ServletRequest.class, MultipartRequest.class,
HttpSession.class, Principal.class, Locale.class, InputStream.class, Reader.class,
WebRequest.class, TimeZone.class, ZoneId.class, HttpMethod.class);
@@ -112,6 +112,15 @@ public class ServletRequestMethodArgumentResolverTests {
assertSame("Invalid result", principal, result);
}
@Test
public void principalAsNull() throws Exception {
MethodParameter principalParameter = new MethodParameter(method, 3);
assertTrue("Principal not supported", resolver.supportsParameter(principalParameter));
Object result = resolver.resolveArgument(principalParameter, null, webRequest, null);
assertNull("Invalid result", result);
}
@Test
public void locale() throws Exception {
Locale locale = Locale.ENGLISH;