root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Defensively handle ServletRequestAttributes casting in requestDestroyed callback 

Issue: SPR-11378
This commit is contained in:
Juergen Hoeller 2014-02-01 11:04:36 +01:00
parent d52f584322
commit 5f2429429f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -64,17 +64,19 @@ public class RequestContextListener implements ServletRequestListener {
@Override @Override
public void requestDestroyed(ServletRequestEvent requestEvent) { public void requestDestroyed(ServletRequestEvent requestEvent) {
ServletRequestAttributes attributes = ServletRequestAttributes attributes = null;
(ServletRequestAttributes) requestEvent.getServletRequest().getAttribute(REQUEST_ATTRIBUTES_ATTRIBUTE); Object reqAttr = requestEvent.getServletRequest().getAttribute(REQUEST_ATTRIBUTES_ATTRIBUTE);
ServletRequestAttributes threadAttributes = if (reqAttr instanceof ServletRequestAttributes) {
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); attributes = (ServletRequestAttributes) reqAttr;
}
RequestAttributes threadAttributes = RequestContextHolder.getRequestAttributes();
if (threadAttributes != null) { if (threadAttributes != null) {
// We're assumably within the original request thread... // We're assumably within the original request thread...
if (attributes == null) {
attributes = threadAttributes;
}
LocaleContextHolder.resetLocaleContext(); LocaleContextHolder.resetLocaleContext();
RequestContextHolder.resetRequestAttributes(); RequestContextHolder.resetRequestAttributes();
if (attributes == null && threadAttributes instanceof ServletRequestAttributes) {
attributes = (ServletRequestAttributes) threadAttributes;
}
} }
if (attributes != null) { if (attributes != null) {
attributes.requestCompleted(); attributes.requestCompleted();