Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix handleRequest re-dispatch
-Added re-dispatch logic inside SpringLambdaContainerHandler's handleRequest
  • Loading branch information
leekib committed Sep 18, 2023
commit aa203912b9a3f871aa40e08f45506e01ccadd3da
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.amazonaws.serverless.proxy.internal.servlet.*;
import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequest;
import com.amazonaws.services.lambda.runtime.Context;
import jakarta.servlet.AsyncContext;
import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet;

Expand Down Expand Up @@ -160,9 +161,21 @@ protected void handleRequest(HttpServletRequest containerRequest, AwsHttpServlet
// process filters
Servlet reqServlet = ((AwsServletContext)getServletContext()).getServletForPath(containerRequest.getPathInfo());
doFilter(containerRequest, containerResponse, reqServlet);
if(requiresAsyncReDispatch(containerRequest)) {
reqServlet = ((AwsServletContext)getServletContext()).getServletForPath(containerRequest.getPathInfo());
doFilter(containerRequest, containerResponse, reqServlet);
}
Timer.stop("SPRING_HANDLE_REQUEST");
}

private boolean requiresAsyncReDispatch(HttpServletRequest request) {
if (request.isAsyncStarted()) {
AsyncContext asyncContext = request.getAsyncContext();
return asyncContext instanceof AwsAsyncContext
&& ((AwsAsyncContext) asyncContext).isDispatchStarted();
}
return false;
}

@Override
public void initialize()
Expand Down