Merge branch '2.3.x' into 2.4.x

wilkinsona · wilkinsona · commit fefd49cce761 · 2021-03-03T16:43:18.000Z
See gh-25481
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java
@@ -97,8 +97,8 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 
 	@Override
 	public void afterAll(ExtensionContext context) throws Exception {
-		FileSystemUtils.deleteRecursively(this.tempDir);
 		cleanupCaches();
+		FileSystemUtils.deleteRecursively(this.tempDir);
 	}
 
 	private void cleanupCaches() {

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public void afterAll(ExtensionContext context) throws Exception {`
`100`		`- FileSystemUtils.deleteRecursively(this.tempDir);`
`101`	`100`	`cleanupCaches();`
	`101`	`+ FileSystemUtils.deleteRecursively(this.tempDir);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`private void cleanupCaches() {`