Merge branch '3.0.x' into 3.1.x

2023-10-31 10:23:01 +01:00
parent cf4fcc52a7 dccf378d49
commit 607ed86edb
10 changed files with 28 additions and 34 deletions
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
@@ -253,7 +253,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi
 		}

 		void clear() {
-			this.lines.get().clear();
+			this.lines.remove();
 		}

 	}