Merge branch '6.1.x'

2024-03-03 20:53:36 +00:00
parent 4a6dbb17f4 877e0b1483
commit 0758c8b14c
8 changed files with 708 additions and 81 deletions
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java
@@ -94,9 +94,8 @@ class StandardServletAsyncWebRequestTests {
 	@Test
 	void startAsyncAfterCompleted() throws Exception {
 		this.asyncRequest.onComplete(new AsyncEvent(new MockAsyncContext(this.request, this.response)));
-		assertThatIllegalStateException().isThrownBy(
-				this.asyncRequest::startAsync)
-			.withMessage("Async processing has already completed");
+		assertThatIllegalStateException().isThrownBy(this.asyncRequest::startAsync)
+				.withMessage("Cannot start async: [COMPLETED]");
 	}

 	@Test