From 9dcdfec2e2c2774fd59d8e410bf821af4a89ecf2 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 8 Sep 2017 19:40:46 +0200 Subject: [PATCH] Properly retrieve and expose HttpServletResponse for async requests Issue: SPR-15867 --- .../org/springframework/web/servlet/FrameworkServlet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index a0e68aae777..b3cb3c3b6c0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1133,8 +1133,9 @@ public abstract class FrameworkServlet extends HttpServletBean implements Applic public void preProcess(NativeWebRequest webRequest, Callable task) { HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); if (request != null) { - HttpServletResponse response = webRequest.getNativeRequest(HttpServletResponse.class); - initContextHolders(request, buildLocaleContext(request), buildRequestAttributes(request, response, null)); + HttpServletResponse response = webRequest.getNativeResponse(HttpServletResponse.class); + initContextHolders(request, buildLocaleContext(request), + buildRequestAttributes(request, response, null)); } } @Override