|
35 | 35 | import org.springframework.security.core.context.SecurityContextHolder;
|
36 | 36 | import org.springframework.security.core.context.SecurityContextHolderStrategy;
|
37 | 37 | import org.springframework.util.Assert;
|
38 |
| -import org.springframework.util.ClassUtils; |
39 | 38 | import org.springframework.web.util.WebUtils;
|
40 | 39 |
|
41 | 40 | /**
|
@@ -95,7 +94,6 @@ public class HttpSessionSecurityContextRepository implements SecurityContextRepo
|
95 | 94 | private final Object contextObject = SecurityContextHolder.createEmptyContext();
|
96 | 95 | private boolean allowSessionCreation = true;
|
97 | 96 | private boolean disableUrlRewriting = false;
|
98 |
| - private boolean isServlet3 = ClassUtils.hasMethod(ServletRequest.class, "startAsync"); |
99 | 97 | private String springSecurityContextKey = SPRING_SECURITY_CONTEXT_KEY;
|
100 | 98 |
|
101 | 99 | private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
|
@@ -127,10 +125,8 @@ public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHold
|
127 | 125 | response, request, httpSession != null, context);
|
128 | 126 | requestResponseHolder.setResponse(wrappedResponse);
|
129 | 127 |
|
130 |
| - if (isServlet3) { |
131 |
| - requestResponseHolder.setRequest(new Servlet3SaveToSessionRequestWrapper( |
132 |
| - request, wrappedResponse)); |
133 |
| - } |
| 128 | + requestResponseHolder.setRequest(new SaveToSessionRequestWrapper( |
| 129 | + request, wrappedResponse)); |
134 | 130 |
|
135 | 131 | return context;
|
136 | 132 | }
|
@@ -269,11 +265,11 @@ public void setSpringSecurityContextKey(String springSecurityContextKey) {
|
269 | 265 | // ~ Inner Classes
|
270 | 266 | // ==================================================================================================
|
271 | 267 |
|
272 |
| - private static class Servlet3SaveToSessionRequestWrapper extends |
| 268 | + private static class SaveToSessionRequestWrapper extends |
273 | 269 | HttpServletRequestWrapper {
|
274 | 270 | private final SaveContextOnUpdateOrErrorResponseWrapper response;
|
275 | 271 |
|
276 |
| - public Servlet3SaveToSessionRequestWrapper(HttpServletRequest request, |
| 272 | + public SaveToSessionRequestWrapper(HttpServletRequest request, |
277 | 273 | SaveContextOnUpdateOrErrorResponseWrapper response) {
|
278 | 274 | super(request);
|
279 | 275 | this.response = response;
|
|
0 commit comments