Merge branch '2.1.x'

wilkinsona · wilkinsona · commit c4756e9057d8 · 2019-03-07T09:43:16.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
@@ -104,6 +104,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
`@@ -104,6 +104,7 @@ public void setup() {`
`104`	`104`	`public void clear() {`
`105`	`105`	`super.clear();`
`106`	`106`	`this.loggingSystem.cleanUp();`
	`107`	`+ ((LoggerContext) StaticLoggerBinder.getSingleton().getLoggerFactory()).stop();`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`@Test`