Merge branch '1.1.x'

2014-09-17 18:06:06 -07:00
parent 3c93d9a803 bebcd60b7c
commit 51b8b1e590
1 changed files with 1 additions and 0 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -96,6 +96,7 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem {
 						+ "or the competing implementation (" + factory.getClass() + ")");
 		LoggerContext context = (LoggerContext) factory;
 		context.stop();
+		context.reset();
 		try {
 			URL url = ResourceUtils.getURL(resolvedLocation);
 			new ContextInitializer(context).configureByResource(url);