From 7c47f554c02a506a8f69af2f7d664794b0df3479 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Mon, 23 Nov 2020 13:32:52 +0100
Subject: [PATCH] Remove unnecessary check in RequestMappingHandlerAdapter

---
 .../mvc/method/annotation/RequestMappingHandlerAdapter.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
index 935e494491..9e5ea44432 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
@@ -880,10 +880,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
 			asyncManager.registerCallableInterceptors(this.callableInterceptors);
 			asyncManager.registerDeferredResultInterceptors(this.deferredResultInterceptors);
 
-			if (asyncManager.hasConcurrentResult() &&
-					asyncManager.getConcurrentResultContext().length > 0 &&
-					asyncManager.getConcurrentResultContext()[0] instanceof ModelAndViewContainer) {
-
+			if (asyncManager.hasConcurrentResult()) {
 				Object result = asyncManager.getConcurrentResult();
 				mavContainer = (ModelAndViewContainer) asyncManager.getConcurrentResultContext()[0];
 				asyncManager.clearConcurrentResult();