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

RequestMappingHandlerAdapter properly invokes handler method in synchronizeOnSession mode again

Browse Source 
Issue: SPR-13999
This commit is contained in:
Juergen Hoeller
2016-02-29 11:12:11 +01:00
parent a2bfe86630
commit 1815a6a7eb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
View File

@@ -117,8 +117,8 @@ import org.springframework.web.util.WebUtils;
public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
implements BeanFactoryAware, InitializingBean { implements BeanFactoryAware, InitializingBean {
private static final boolean completionStagePresent = ClassUtils.isPresent("java.util.concurrent.CompletionStage", private static final boolean completionStagePresent = ClassUtils.isPresent(
RequestMappingHandlerAdapter.class.getClassLoader()); "java.util.concurrent.CompletionStage", RequestMappingHandlerAdapter.class.getClassLoader());
private List<HandlerMethodArgumentResolver> customArgumentResolvers; private List<HandlerMethodArgumentResolver> customArgumentResolvers;
@@ -739,8 +739,9 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
} }
} }
} }
else {
mav = invokeHandlerMethod(request, response, handlerMethod); mav = invokeHandlerMethod(request, response, handlerMethod);
}
if (getSessionAttributesHandler(handlerMethod).hasSessionAttributes()) { if (getSessionAttributesHandler(handlerMethod).hasSessionAttributes()) {
applyCacheSeconds(response, this.cacheSecondsForSessionAttributeHandlers); applyCacheSeconds(response, this.cacheSecondsForSessionAttributeHandlers);