Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-23671
This commit is contained in:
Andy Wilkinson
2020-10-13 11:20:18 +01:00
parent de685bdca4 667ccdae84
commit a9a32f39b5
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java
View File

@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Files;
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.core.io.Resource;
@@ -93,9 +94,7 @@ public class SpringBootMockServletContext extends MockServletContext {
try {
if (this.emptyRootDirectory == null) {
synchronized (this) {
File tempDirectory = File.createTempFile("spr", "servlet");
tempDirectory.delete();
tempDirectory.mkdirs();
File tempDirectory = Files.createTempDirectory("spr-servlet").toFile();
tempDirectory.deleteOnExit();
this.emptyRootDirectory = tempDirectory;
}