Merge branch '6.2.x'

Author: sbrannen

spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java

@@ -162,11 +162,10 @@ void startCallableProcessingDisconnectedClient() throws Exception {
 		AsyncEvent event = new AsyncEvent(new MockAsyncContext(this.servletRequest, this.servletResponse), ex);
 		this.asyncWebRequest.onError(event);
 
-		MockAsyncContext asyncContext = (MockAsyncContext) this.servletRequest.getAsyncContext();
 		assertThat(this.asyncManager.hasConcurrentResult()).isTrue();
 		assertThat(this.asyncManager.getConcurrentResult())
-				.as("Disconnected client error not wrapped AsyncRequestNotUsableException")
-				.isOfAnyClassIn(AsyncRequestNotUsableException.class);
+				.as("Disconnected client error not wrapped in AsyncRequestNotUsableException")
+				.isExactlyInstanceOf(AsyncRequestNotUsableException.class);
 	}
 
 	@Test
@@ -287,8 +286,8 @@ void startDeferredResultProcessingDisconnectedClient() throws Exception {
 
 		assertThat(this.asyncManager.hasConcurrentResult()).isTrue();
 		assertThat(deferredResult.getResult())
-				.as("Disconnected client error not wrapped AsyncRequestNotUsableException")
-				.isOfAnyClassIn(AsyncRequestNotUsableException.class);
+				.as("Disconnected client error not wrapped in AsyncRequestNotUsableException")
+				.isExactlyInstanceOf(AsyncRequestNotUsableException.class);
 	}