Merge branch '2.0.x' into 2.1.x

wilkinsona · wilkinsona · commit f46894dfd321 · 2019-03-07T09:43:02.000Z
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -107,6 +107,7 @@ public void setup() {
 	public void clear() {
 		super.clear();
 		this.loggingSystem.cleanUp();
+		((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).stop();
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ public void setup() {`
`107`	`107`	`public void clear() {`
`108`	`108`	`super.clear();`
`109`	`109`	`this.loggingSystem.cleanUp();`
	`110`	`+ ((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).stop();`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`@Test`