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

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2017-06-01 11:04:23 +01:00
parent c22230a418 5b4f9edc86
commit 5c708ae712
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
View File

@ -61,8 +61,11 @@ public class PropertiesLauncherTests {
@Rule @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();
private ClassLoader contextClassLoader;
@Before @Before
public void setup() throws IOException { public void setup() throws IOException {
this.contextClassLoader = Thread.currentThread().getContextClassLoader();
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
System.setProperty("loader.home", System.setProperty("loader.home",
new File("src/test/resources").getAbsolutePath()); new File("src/test/resources").getAbsolutePath());
@ -70,6 +73,7 @@ public class PropertiesLauncherTests {
@After @After
public void close() { public void close() {
Thread.currentThread().setContextClassLoader(this.contextClassLoader);
System.clearProperty("loader.home"); System.clearProperty("loader.home");
System.clearProperty("loader.path"); System.clearProperty("loader.path");
System.clearProperty("loader.main"); System.clearProperty("loader.main");