Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Perform null check on super.getAsyncContext() 

Fixes gh-3780
This commit is contained in:
Rob Winch 2016-04-01 09:51:44 -05:00
parent 14fb2276e2
commit d900c78f11
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java
View File

@ -177,6 +177,9 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
public AsyncContext getAsyncContext() { public AsyncContext getAsyncContext() {
AsyncContext asyncContext = super.getAsyncContext(); AsyncContext asyncContext = super.getAsyncContext();
if (asyncContext == null) {
return null;
}
return new SecurityContextAsyncContext(asyncContext); return new SecurityContextAsyncContext(asyncContext);
} }

6
web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java
View File

@ -300,6 +300,12 @@ public class SecurityContextHolderAwareRequestFilterTests {
this.logoutHandler); this.logoutHandler);
} }
// gh-3780
@Test
public void getAsyncContextNullFromSuper() throws Exception {
assertThat(wrappedRequest().getAsyncContext()).isNull();
}
@Test @Test
public void getAsyncContextStart() throws Exception { public void getAsyncContextStart() throws Exception {
ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class); ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);