From aea3a750189977ca231172db87408f03979bace6 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 21 Oct 2016 16:19:41 -0400 Subject: [PATCH] Fix failing tests Issue: SPR-14772, SPR-14803 --- .../http/server/reactive/ServletHttpHandlerAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java index c65969a4e8..6c5449a644 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java @@ -90,12 +90,14 @@ public class ServletHttpHandlerAdapter extends HttpHandlerAdapterSupport @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException { + // Start async before Read/WriteListener registration + AsyncContext asyncContext = servletRequest.startAsync(); + ServletServerHttpRequest request = new ServletServerHttpRequest( ((HttpServletRequest) servletRequest), getDataBufferFactory(), getBufferSize()); ServletServerHttpResponse response = new ServletServerHttpResponse( ((HttpServletResponse) servletResponse), getDataBufferFactory(), getBufferSize()); - AsyncContext asyncContext = servletRequest.startAsync(); asyncContext.addListener(new EventHandlingAsyncListener(request, response)); HandlerResultSubscriber resultSubscriber = new HandlerResultSubscriber(asyncContext);