root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x 

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

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/AbstractConfigurableWebServerFactory.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.web.server;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.nio.file.Files;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
@ -185,9 +186,7 @@ public abstract class AbstractConfigurableWebServerFactory implements Configurab
*/ */
protected final File createTempDir(String prefix) { protected final File createTempDir(String prefix) {
try { try {
File tempDir = File.createTempFile(prefix + ".", "." + getPort()); File tempDir = Files.createTempDirectory(prefix + "." + getPort() + ".").toFile();
tempDir.delete();
tempDir.mkdir();
tempDir.deleteOnExit(); tempDir.deleteOnExit();
return tempDir; return tempDir;
} }