|
40 | 40 | import org.springframework.util.Assert;
|
41 | 41 | import org.springframework.util.ClassUtils;
|
42 | 42 | import org.springframework.util.MultiValueMap;
|
43 |
| -import org.springframework.web.context.request.NativeWebRequest; |
44 |
| -import org.springframework.web.context.request.RequestAttributes; |
45 | 43 | import org.springframework.web.context.request.async.AsyncWebRequest;
|
46 | 44 | import org.springframework.web.context.request.async.DeferredResult;
|
47 |
| -import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor; |
48 | 45 | import org.springframework.web.context.request.async.WebAsyncManager;
|
49 | 46 | import org.springframework.web.context.request.async.WebAsyncUtils;
|
50 | 47 | import org.springframework.web.servlet.ModelAndView;
|
|
57 | 54 | */
|
58 | 55 | final class DefaultAsyncServerResponse extends ErrorHandlingServerResponse implements AsyncServerResponse {
|
59 | 56 |
|
60 |
| - private static final DeferredResultProcessingInterceptor CLEAR_PATTERN_ATTRIBUTE_INTERCEPTOR = |
61 |
| - new DeferredResultProcessingInterceptor() { |
62 |
| - @Override |
63 |
| - public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult, |
64 |
| - Object concurrentResult) { |
65 |
| - request.removeAttribute(RouterFunctions.MATCHING_PATTERN_ATTRIBUTE, |
66 |
| - RequestAttributes.SCOPE_REQUEST); |
67 |
| - } |
68 |
| - }; |
69 |
| - |
70 | 57 | static final boolean reactiveStreamsPresent = ClassUtils.isPresent(
|
71 | 58 | "org.reactivestreams.Publisher", DefaultAsyncServerResponse.class.getClassLoader());
|
72 | 59 |
|
@@ -141,7 +128,6 @@ static void writeAsync(HttpServletRequest request, HttpServletResponse response,
|
141 | 128 | WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
|
142 | 129 | AsyncWebRequest asyncWebRequest = WebAsyncUtils.createAsyncWebRequest(request, response);
|
143 | 130 | asyncManager.setAsyncWebRequest(asyncWebRequest);
|
144 |
| - asyncManager.registerDeferredResultInterceptors(CLEAR_PATTERN_ATTRIBUTE_INTERCEPTOR); |
145 | 131 | try {
|
146 | 132 | asyncManager.startDeferredResultProcessing(deferredResult);
|
147 | 133 | }
|
|
0 commit comments