Merge branch '1.3.x'

9 years ago · 34a864447f
parent a80ada64c3 43a5b77256
commit 34a864447f
1 changed files with 3 additions and 1 deletions
--- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
@ -16,6 +16,7 @@

 package org.springframework.boot.logging.logback;

+import ch.qos.logback.classic.BasicConfigurator;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.core.joran.spi.JoranException;
@ -69,7 +70,8 @@ public class SpringBootJoranConfiguratorTests {

 	@After
 	public void reset() {
-		this.context.reset();
+		this.context.stop();
+		BasicConfigurator.configureDefaultContext();
 	}

 	@Test